commit cbfbd85c8e6fa426fef0ed943f117c47babc8dfa
author Jiyong Park <jiyong@google.com> Tue Jun 27 08:07:13 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 27 08:07:15 2017 +0000
tree e19e6222d9a864e2ade615605387d41ef44758d7
parent 1f9e5b0710bd6d26d2c0dd7634a700b24b9f4a91
parent bffa875d78e9ed203aec3e308fcb4cf86582f3f9

Merge "resolve merge conflicts of 40da4609e to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 3a353c2..748105c 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -16,6 +16,16 @@
     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 {
@@ -80,11 +90,6 @@
         "libbinder_headers",
     ],
 
-    export_shared_lib_headers: [
-        "libbase",
-        "libutils",
-    ],
-
     export_header_lib_headers: [
         "libbinder_headers",
     ],