commit ec6af171468cd9c6e3a731d89f5f7ccf0f122cf3
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 06 23:33:13 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 06 23:33:13 2020 +0000
tree 2c496c3f62e4288a118c6c71ccd580b913d8bec7
parent 1d2276f4fdcee090bee9385da25b7df7cc548ce3
parent f1d8291a4ace285122795dacea79b91ef17d3725

Merge "Don't re-export libbinder headers from libstagefright_foundation" am: 4c358801fb am: f1d8291a4a

Change-Id: I755d7c6698eef3344f7aa30f81732abaf56ade62

media/codec2/hidl/1.0/utils/Android.bp

diff --git a/media/codec2/hidl/1.0/utils/Android.bp b/media/codec2/hidl/1.0/utils/Android.bp
index bdff29a..a2930a6 100644
--- a/media/codec2/hidl/1.0/utils/Android.bp
+++ b/media/codec2/hidl/1.0/utils/Android.bp
@@ -63,6 +63,7 @@
     ],
 
     header_libs: [
+        "libbinder_headers",
         "libsystem_headers",
         "libcodec2_internal", // private
     ],

media/libstagefright/codecs/on2/enc/Android.bp

diff --git a/media/libstagefright/codecs/on2/enc/Android.bp b/media/libstagefright/codecs/on2/enc/Android.bp
index cd69e0d..705e554 100644
--- a/media/libstagefright/codecs/on2/enc/Android.bp
+++ b/media/libstagefright/codecs/on2/enc/Android.bp
@@ -21,4 +21,5 @@
     },
 
     shared_libs: ["libvpx"],
+    header_libs: ["libbase_headers"],
 }

media/libstagefright/foundation/Android.bp

diff --git a/media/libstagefright/foundation/Android.bp b/media/libstagefright/foundation/Android.bp
index b95f054..effbb4e 100644
--- a/media/libstagefright/foundation/Android.bp
+++ b/media/libstagefright/foundation/Android.bp
@@ -34,10 +34,6 @@
         "media_plugin_headers",
     ],
 
-    export_shared_lib_headers: [
-        "libbinder",
-    ],
-
     cflags: [
         "-Wno-multichar",
         "-Werror",