commit 64639fd7dc7393bacb154929042949df02f999e0
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 17 23:07:37 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 17 23:07:38 2017 +0000
tree be85347c181eede22c2e4966fae5d19c857c2599
parent 9610c548a8e9018ecdfbe3d7204e8fd70d2554fc
parent 1f83aa424f537cf3f07e1d27dbbcc524818b5358

Merge "libcutils: compile with BOARD_VNDK_VERSION current" into oc-dev

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index db1434b..513736d 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -31,16 +31,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,
         },
@@ -52,6 +50,7 @@
 
 cc_library {
     name: "libcutils",
+    vendor_available: true,
     host_supported: true,
     srcs: [
         "config_utils.c",