commit b7df6cba8ebd3ff7dcb0f761d53256111b3b47e7
author Jiyong Park <jiyong@google.com> Thu Apr 13 21:19:48 2017 -0700
committer Steven Moreland <smoreland@google.com> Mon Jun 26 21:44:26 2017 +0000
tree a428fdba95a0e9e841acd1524f7c30d904a01b9c
parent bbf3096e2208ef746bfd0036fa964ff5b482bc78

libbinder: really make it available to vendors

Fixed a bug that vendor variant of the lib is not built due to missing
global include path.

Bug: 36426473
Bug: 36079834
Test: BOARD_VNDK_VERSION=current m -j libbinder.vendor successful

Change-Id: Ice32a23023d7fd9b78c084c3bef455f7008fe4da

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 77a8c02..087718e 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -15,6 +15,17 @@
 cc_library_headers {
     name: "libbinder_headers",
     export_include_dirs: ["include"],
+    vendor_available: true,
+    header_libs: [
+        "libbase_headers",
+        "libcutils_headers",
+        "libutils_headers",
+    ],
+    export_header_lib_headers: [
+        "libbase_headers",
+        "libcutils_headers",
+        "libutils_headers",
+    ],
 }
 
 cc_library {
@@ -70,9 +81,13 @@
         "libcutils",
         "libutils",
     ],
-    export_shared_lib_headers: [
-        "libbase",
-        "libutils",
+
+    header_libs: [
+        "libbinder_headers",
+    ],
+
+    export_header_lib_headers: [
+        "libbinder_headers",
     ],
 
     clang: true,