commit deeb5eb8fb6424eaa65ee5eed5d53fead0ce421a
author Steven Moreland <smoreland@google.com> Mon Apr 17 23:19:14 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 17 23:19:14 2017 +0000
tree 9cc0a486a72313e7d5193ced42acf97e94996fd9
parent c4b1a2f2305b078c5cf13e2b0382de1ad3df5b7a
parent 9610c548a8e9018ecdfbe3d7204e8fd70d2554fc

libcutils: vendor_available
am: 9610c548a8

Change-Id: I504b4f52357fa3580e9154291021b57c07bd8b02

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index bb82f4d..54ed6f4 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",