commit 7c44826eaba2e3ff4483b127c6bc091e46d0604c
author Steven Moreland <smoreland@google.com> Thu Jul 09 16:56:09 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 09 16:56:09 2020 +0000
tree 70b2e49b02ac0485d4010700b3a25a02f6a1a2e1
parent 32fdde7c37170aa9d9dd911688d01029a7bc1205
parent 42e294c71e4619150225e648d3b9b66e9b66c109

Merge "Avoid TREBLE_TESTING_OVERRIDE"

media/extractors/mpeg2/Android.bp

diff --git a/media/extractors/mpeg2/Android.bp b/media/extractors/mpeg2/Android.bp
index a3268fa..2bea0cb 100644
--- a/media/extractors/mpeg2/Android.bp
+++ b/media/extractors/mpeg2/Android.bp
@@ -1,6 +1,16 @@
 cc_library {
     name: "libmpeg2extractor",
 
+    host_supported: true,
+    target: {
+        darwin: {
+            enabled: false,
+        },
+        android: {
+            shared_libs: ["libvndksupport#29"],
+        },
+    },
+
     defaults: ["extractor-defaults"],
 
     srcs: [
@@ -11,7 +21,6 @@
 
     shared_libs: [
         "libcgrouprc#29",
-        "libvndksupport#29",
     ],
 
     header_libs: [

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/libstagefright/mpeg2ts/Android.bp

diff --git a/media/libstagefright/mpeg2ts/Android.bp b/media/libstagefright/mpeg2ts/Android.bp
index 1b71a2b..5d697f7 100644
--- a/media/libstagefright/mpeg2ts/Android.bp
+++ b/media/libstagefright/mpeg2ts/Android.bp
@@ -47,6 +47,14 @@
     ],
 
     min_sdk_version: "29",
+
+    host_supported: true,
+
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
 }