commit 6c19d67a7355c189e0f1ea9b01e357ec82d4059f
author Tom Cherry <tomcherry@google.com> Mon Sep 21 20:35:31 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 21 20:35:31 2020 +0000
tree cf09345119b6ae95b57584b6dd0edbc486bced46
parent bfb889002bbf70123753fa4fe0f025e8b4039cee
parent 379ed1ef62d4c3c340e7c92db6f995e014fa308b

Merge "Explicitly add the include path for android_filesystem_config.h"

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 49b75c1..a761e3b 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -62,6 +62,8 @@
     cppflags: [],
     include_dirs: [
         "bionic/libc/async_safe/include",
+        // For android_filesystem_config.h.
+        "system/core/libcutils/include",
     ],
 
     header_libs: [

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 586ef34..8760256 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -44,6 +44,7 @@
         // For glibc.
         "-D__STDC_LIMIT_MACROS",
     ],
+    header_libs: ["libcutils_headers"],
     // Ensure that the tests exercise shadow call stack support and
     // the hint space PAC/BTI instructions.
     arch: {