commit 31e83e5b6f44a6560b1d7d5876ea984ce2c64938
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 01 19:07:16 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 01 19:07:16 2020 +0000
tree fd75cbf71ea4f1d1a30aa71293a1d3214f01adf4
parent 278d6d844cb5c553e5e792e39fc5c0ea356398c5
parent 12c6ff7ee20d0c41fd08e98b3de8539180903b15

Merge changes Ib5923f6c,I1814f07e

* changes:
  libstagefright_id3: Add host support
  Added libmedia_datasource_headers header library

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index b56ea56..6a8f981 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -15,6 +15,18 @@
     ],
 }
 
+cc_library_headers {
+    name: "libmedia_datasource_headers",
+    export_include_dirs: ["include"],
+    host_supported: true,
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+    apex_available: ["com.android.media"],
+}
+
 filegroup {
     name: "libmedia_omx_aidl",
     srcs: [

media/libstagefright/id3/Android.bp

diff --git a/media/libstagefright/id3/Android.bp b/media/libstagefright/id3/Android.bp
index c8173cf..02de2c0 100644
--- a/media/libstagefright/id3/Android.bp
+++ b/media/libstagefright/id3/Android.bp
@@ -4,7 +4,9 @@
     srcs: ["ID3.cpp"],
 
     header_libs: [
-        "libmedia_headers",
+        "libmedia_datasource_headers",
+        "libstagefright_foundation_headers",
+        "libstagefright_headers",
         "media_ndk_headers",
     ],
 
@@ -18,6 +20,12 @@
         ],
         cfi: true,
     },
+    host_supported: true,
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
 }
 
 //###############################################################################