Merge "make libaudioutils_fixedfft vendor_available:true" into oc-dev
am: b8ca85c9ad
Change-Id: I31e13f7517d8fbe708acd7110eb616be7104b95b
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 1096f5d..7bc9963 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -53,6 +53,10 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudioutils_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/filterfw_intermediates)
$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/framework/filterfw.jar)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/symbols/system/lib/libalsautils.so)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/symbols/system/lib64/libalsautils.so)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib/libalsautils.so)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib64/libalsautils.so)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/audio_effects/Android.bp b/audio_effects/Android.bp
new file mode 100644
index 0000000..e4e44b7
--- /dev/null
+++ b/audio_effects/Android.bp
@@ -0,0 +1,6 @@
+cc_library_headers {
+ name: "libaudioeffects",
+ header_libs: ["libhardware_headers"],
+ export_header_lib_headers: ["libhardware_headers"],
+ export_include_dirs: ["include"],
+}
diff --git a/camera/docs/metadata-generate b/camera/docs/metadata-generate
index 0e4dfc2..4912421 100755
--- a/camera/docs/metadata-generate
+++ b/camera/docs/metadata-generate
@@ -21,7 +21,7 @@
# docs.html
# ../src/camera_metadata_tag_info.c
# ../src/camera_metadata_tags.h
-# ../../../../frameworks/av/include/camera/ndk/NdkCameraMetadataTags.h
+# ../../../../frameworks/av/camera/ndk/include/camera/NdkCameraMetadataTags.h
# ../../../../frameworks/av/camera/ndk/impl/ACameraMetadata.cpp
# ../../../../cts/tests/camera/src/android/hardware/camera2/cts/CaptureResultTest.java
# ../../../../frameworks/base/core/java/android/hardware/camera2/CameraCharacteristics.java
@@ -38,7 +38,7 @@
fwkdir_html="$ANDROID_BUILD_TOP/frameworks/base/docs/html"
ctsdir="$ANDROID_BUILD_TOP/cts/tests/camera/src/android/hardware/camera2/cts"
outdir="$ANDROID_PRODUCT_OUT/obj/ETC/system-media-camera-docs_intermediates"
-ndk_header_dir="$ANDROID_BUILD_TOP/frameworks/av/include/camera/ndk"
+ndk_header_dir="$ANDROID_BUILD_TOP/frameworks/av/camera/ndk/include/camera"
ndk_impl_dir="$ANDROID_BUILD_TOP/frameworks/av/camera/ndk/impl"
device_info_dir="$ANDROID_BUILD_TOP/cts/tools/cts-device-info/"`
`"src/com/android/cts/deviceinfo"