commit 3287b2197571b2cedda4ada0909afa940985a561
author Dongwon Kang <dwkang@google.com> Tue Aug 06 16:40:48 2019 -0700
committer Dongwon Kang <dwkang@google.com> Wed Aug 07 15:45:27 2019 +0000
tree d9f7fbb93e186c2c447ad0d382c83f04078c3626
parent 27ae8a1b3e036c2de2b096e06e590071bf1f9131

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
Bug: 139016109
Change-Id: If448572daa5434a71a7b8a5499424a2175123425

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 cdbdd97..8e23c62 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: [
         "android.hidl.token@1.0",
-        "libbinder",
         "libhidlbase",
         "liblog",
         "libutils",
     ],
 
+    export_header_lib_headers: [
+        "libbinder_headers",
+    ],
+
     export_shared_lib_headers: [
-        "libbinder",
         "libhidlbase",
     ],