From a5edc0fbbc0bce032ef64ca43c8434b0c1991ef3 Mon Sep 17 00:00:00 2001
From: Tom Cherry <tomcherry@google.com>
Date: Thu, 17 Sep 2020 09:38:42 -0700
Subject: [PATCH] Use libcutils_headers for android_filesystem_config.h

android_filesystem_config.h is found since system/core/include is on
the include path for all projects and contains a symlink to the real
android_filesystem_config.h.  This is fragile and the below bug seeks
to remove this symlink and have users correctly depend on
libcutils_headers.

Bug: 165825252
Test: build
Change-Id: I1aad6a2e8fbe87635e97b0ac1be3414403353382
---
 libcutils/Android.bp            | 1 +
 liblog/Android.bp               | 1 +
 libstats/push_compat/Android.bp | 5 ++++-
 logd/Android.bp                 | 1 +
 run-as/Android.bp               | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 04b8f66f6..524b715fd 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -28,6 +28,7 @@ cc_library_headers {
     name: "libcutils_headers",
     vendor_available: true,
     recovery_available: true,
+    ramdisk_available: true,
     host_supported: true,
     apex_available: [
         "//apex_available:platform",
diff --git a/liblog/Android.bp b/liblog/Android.bp
index 6051ac7fa..9c1c46319 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -97,6 +97,7 @@ cc_library {
 
     header_libs: [
         "libbase_headers",
+        "libcutils_headers",
         "liblog_headers",
     ],
     export_header_lib_headers: ["liblog_headers"],
diff --git a/libstats/push_compat/Android.bp b/libstats/push_compat/Android.bp
index a63a5b63b..43ae69d2e 100644
--- a/libstats/push_compat/Android.bp
+++ b/libstats/push_compat/Android.bp
@@ -32,7 +32,10 @@ cc_defaults {
         "-DWRITE_TO_STATSD=1",
         "-DWRITE_TO_LOGD=0",
     ],
-    header_libs: ["libstatssocket_headers"],
+    header_libs: [
+        "libcutils_headers",
+        "libstatssocket_headers",
+    ],
     static_libs: [
         "libbase",
     ],
diff --git a/logd/Android.bp b/logd/Android.bp
index fe22d1caa..c057ef07c 100644
--- a/logd/Android.bp
+++ b/logd/Android.bp
@@ -36,6 +36,7 @@ cc_defaults {
         "libz",
     ],
     static_libs: ["libzstd"],
+    header_libs: ["libcutils_headers"],
     cflags: [
         "-Wextra",
         "-Wthread-safety",
diff --git a/run-as/Android.bp b/run-as/Android.bp
index 840a43c47..accd07d01 100644
--- a/run-as/Android.bp
+++ b/run-as/Android.bp
@@ -25,4 +25,5 @@ cc_binary {
         "libpackagelistparser",
         "libminijail",
     ],
+    header_libs: ["libcutils_headers"],
 }