commit 32fdde7c37170aa9d9dd911688d01029a7bc1205
author Kris Alder <kalder@google.com> Thu Jul 09 14:11:02 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 09 14:11:02 2020 +0000
tree a267779bdd19424adf7d10270a73cc7fce08d9e8
parent 91eaf143f8e8e701352c4e30c491cfd613864526
parent 7606712e7731c1e8abed30da9e20f045bd0298b6

Merge "libmpeg2extractor: Add host support"

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index e276508..99df845 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -192,7 +192,7 @@
     ],
 
     header_libs: [
-        "libmedia_headers",
+        "libmedia_datasource_headers",
         "media_ndk_headers",
     ],
 
@@ -209,6 +209,14 @@
         ],
         cfi: true,
     },
+
+    host_supported: true,
+
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
 }
 
 cc_library_shared {

media/ndk/Android.bp

diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index 13791c9..20a68db 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -35,6 +35,8 @@
 cc_library_headers {
     name: "media_ndk_headers",
     vendor_available: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     apex_available: [
         "//apex_available:platform",
         "com.android.media",