commit e6652a687a233e96c4d2d909bd1dfc732bb3c1a2
author Steven Moreland <smoreland@google.com> Mon Jan 08 22:23:10 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 08 22:23:10 2018 +0000
tree d2bd587624cd116188f55b15bbc40c6287fdfed0
parent 03e92c1cd670eb0ab37ac3fdabd27c283150b52f
parent 58b1cf5718eb86961f2dac51c1178c54c61e1705

Merge "Use override_export_include_dirs."
am: affd4e9bd9

Change-Id: I96856ad536505c7ee09bbdddae19b9f177c2d8f9

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"],
         },
     },
 }