commit ec96bfafe4305e06306b4e9a8e81f38ac146cb1e
author Steven Moreland <smoreland@google.com> Tue Jan 09 01:56:13 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 09 01:56:13 2018 +0000
tree eab8f275a38d3d21690c630864e9f49bb55fd7b8
parent e3cc33057813c52654286fd2dd1c35a69f6039a1
parent 579b99a853bd8ef88675ac97327950e205a46602

Merge "Use override_export_include_dirs." am: affd4e9bd9 am: c89b767401
am: 25a8d084f6

Change-Id: Ie72a68b427ae3679c3f9e857b0587b8128e8055f

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 9cba109..6d00dc6 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -36,7 +36,7 @@
     export_include_dirs: ["include"],
     target: {
         vendor: {
-            export_include_dirs: ["include_vndk"],
+            override_export_include_dirs: ["include_vndk"],
         },
         linux_bionic: {
             enabled: true,

liblog/Android.bp

diff --git a/liblog/Android.bp b/liblog/Android.bp
index d5bb29e..7d9e306 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -55,7 +55,7 @@
             enabled: true,
         },
         vendor: {
-            export_include_dirs: ["include_vndk"],
+            override_export_include_dirs: ["include_vndk"],
         },
     },
 }