commit d4010ad4b87b78e80a7cddde1172161ce830708e
author Steven Moreland <smoreland@google.com> Thu Apr 20 01:49:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 20 01:49:30 2017 +0000
tree 447b9a6242dc7a4908c7e592177849685f07eac3
parent 9529a0fe6f651d15cb175a20a9cde494695445a7
parent 385fe692cccce3a00534bd3b20c471f62fadcd4d

libcutils: vendor_available
am: 385fe692cc

Change-Id: I3f729a42636ea2f00ac42c1a134f1a0600db1bee

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 0a3bab7..58170ec 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -30,16 +30,14 @@
 ]
 
 cc_library_headers {
-    name: "libcutils_vndk_headers",
-    host_supported: true,
-    export_include_dirs: ["include_vndk"],
-}
-
-cc_library_headers {
     name: "libcutils_headers",
+    vendor_available: true,
     host_supported: true,
     export_include_dirs: ["include"],
     target: {
+        vendor: {
+            export_include_dirs: ["include_vndk"],
+        },
         linux_bionic: {
             enabled: true,
         },
@@ -51,6 +49,7 @@
 
 cc_library {
     name: "libcutils",
+    vendor_available: true,
     host_supported: true,
     srcs: [
         "config_utils.c",