Merge "libalsautils: moved to vendor partition"

diff --git a/audio/Android.bp b/audio/Android.bp
new file mode 100644 (file)
index 0000000..1e9e569
--- /dev/null
+++ b/audio/Android.bp
@@ -0,0 +1,19 @@
+cc_library_headers {
+    name: "libaudio_system_headers",
+    host_supported: true,
+    vendor_available: true,
+
+    header_libs: ["libcutils_headers"],
+    export_header_lib_headers: ["libcutils_headers"],
+
+    export_include_dirs: ["include"],
+
+    target: {
+        linux_bionic: {
+            enabled: true,
+        },
+        windows: {
+            enabled: true,
+        },
+    }
+}

diff --git a/audio_effects/Android.bp b/audio_effects/Android.bp
new file mode 100644 (file)
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/Android.bp b/camera/Android.bp
index c020b2e..4a2c96f 100644 (file)
--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -2,6 +2,7 @@ subdirs = ["tests"]
 
 cc_library_shared {
     name: "libcamera_metadata",
+    vendor_available: true,
     srcs: ["src/camera_metadata.c"],
 
     include_dirs: ["system/media/private/camera/include"],

diff --git a/camera/docs/metadata-generate b/camera/docs/metadata-generate
index 0e4dfc2..4912421 100755 (executable)
--- 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="$ANDROID_BUILD_TOP/frameworks/base/core/java/android/hardware/camera2/"
 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"

diff --git a/radio/Android.bp b/radio/Android.bp
index b56434d..91ded20 100644 (file)
--- a/radio/Android.bp
+++ b/radio/Android.bp
@@ -1,5 +1,6 @@
 cc_library_shared {
     name: "libradio_metadata",
+    vendor_available: true,
 
     srcs: [
         "src/radio_metadata.c",
@@ -12,6 +13,9 @@ cc_library_shared {
         "-fvisibility=hidden",
     ],
 
+    header_libs: ["libsystem_headers"],
+    export_header_lib_headers: ["libsystem_headers"],
+
     local_include_dirs: ["include"],
     export_include_dirs: ["include"],
 

diff --git a/radio/src/RadioMetadataWrapper.cpp b/radio/src/RadioMetadataWrapper.cpp
index d7843f2..fbb4fb0 100644 (file)
--- a/radio/src/RadioMetadataWrapper.cpp
+++ b/radio/src/RadioMetadataWrapper.cpp
@@ -2,7 +2,7 @@
 //#define LOG_NDEBUG 0
 
 #include <system/RadioMetadataWrapper.h>
-#include <utils/Log.h>
+#include <log/log.h>
 
 namespace android {