commit 92e12a93a7211232912ef600fb971d5ed582c8ef
author Marco Nelissen <marcone@google.com> Tue Dec 18 13:41:04 2018 -0800
committer Marco Nelissen <marcone@google.com> Wed Dec 19 14:04:19 2018 -0800
tree 2c2e3a83012ab1116a7259d5f55e72ee7ae6c962
parent 6f1eed673b90d60efcbdfc797ac88a03778ec35a

Don't link with libbinder itself just for the headers

By linking with libbinder.so, it ends up being an actual dependency
for anything that links with android.hidl.token@1.0-utils, which
results in it being copied into APEX files when it shouldn't be.
Use libbinder_headers instead.

Test: build
Change-Id: Ied5a108e4ae8f862fae42a81594d6f0e414a4685

transport/token/1.0/utils/Android.bp

diff --git a/transport/token/1.0/utils/Android.bp b/transport/token/1.0/utils/Android.bp
index d706cf6..5a8d51c 100644
--- a/transport/token/1.0/utils/Android.bp
+++ b/transport/token/1.0/utils/Android.bp
@@ -25,16 +25,22 @@
         "HybridInterface.cpp",
     ],
 
+    header_libs: [
+        "libbinder_headers",
+    ],
+
     shared_libs: [
         "libutils",
-        "libbinder",
         "liblog",
         "libhidlbase",
         "android.hidl.token@1.0",
     ],
 
+    export_header_lib_headers: [
+        "libbinder_headers",
+    ],
+
     export_shared_lib_headers: [
-        "libbinder",
         "libhidlbase",
     ],