commit b9ff8acd4df88eca5b360eb22f5123cc1b6ad2bd
author Lajos Molnar <lajos@google.com> Tue Apr 27 21:56:27 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 27 21:56:27 2021 +0000
tree 950b9c484c83ef2eee2bc770a6e7edd897ddd191
parent b4b7fb20da03035095d2f1fe0600d51c6b94daf6
parent 47ac0df24cacc7814d5074e5c3def0a5152f7415

Merge "libstagefright_foundation: Add libbinder_headers." am: 11ff74e46a am: 88178d9b3d am: 47ac0df24c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1685032

Change-Id: I9c1097ca4735e5c8e637da7ef335a8c8071fe09a

media/libstagefright/foundation/Android.bp

diff --git a/media/libstagefright/foundation/Android.bp b/media/libstagefright/foundation/Android.bp
index 7655d90..4bfc673 100644
--- a/media/libstagefright/foundation/Android.bp
+++ b/media/libstagefright/foundation/Android.bp
@@ -45,6 +45,9 @@
     ],
 
     header_libs: [
+        // this is only needed for the vendor variant that removes libbinder, but vendor
+        // target below does not allow adding header_libs.
+        "libbinder_headers",
         "libstagefright_foundation_headers",
         "media_ndk_headers",
         "media_plugin_headers",
@@ -98,6 +101,7 @@
 
     target: {
         vendor: {
+            // TODO: add libbinder_headers here instead of above when it becomes supported
             exclude_shared_libs: [
                 "libbinder",
             ],