commit d2c67b3673506477d66f50ee3837a0fd79c6fee7
author Elliott Hughes <enh@google.com> Fri Nov 15 17:48:44 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 15 17:48:44 2024 +0000
tree 280fc7400517abba04d29c8dbdccd915d82c8f92
parent e878654989ac4a095d33f75c67214c6bef8cd7b6
parent d68632becc07949a48744196acaf884a9f69c867

Merge "Stop explicitly adding bionic subdirectories to the include path." into main am: d68632becc

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3352958

Change-Id: Idae44755f445ac9aaee0767842667209075418c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/libsnapshot/snapuserd/Android.bp

diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp
index 97cfe76..639116e 100644
--- a/fs_mgr/libsnapshot/snapuserd/Android.bp
+++ b/fs_mgr/libsnapshot/snapuserd/Android.bp
@@ -89,7 +89,6 @@
         "libprocessgroup_util",
         "libjsoncpp",
     ],
-    include_dirs: ["bionic/libc/kernel"],
     export_include_dirs: ["include"],
     header_libs: [
         "libcutils_headers",
@@ -144,7 +143,6 @@
         "libstorage_literals_headers",
     ],
 
-    include_dirs: ["bionic/libc/kernel"],
     system_shared_libs: [],
 
     // snapuserd is started during early boot by first-stage init. At that
@@ -226,7 +224,6 @@
         "libz",
     ],
     include_dirs: [
-        "bionic/libc/kernel",
         ".",
     ],
     header_libs: [
@@ -324,7 +321,6 @@
         "libz",
     ],
     include_dirs: [
-        "bionic/libc/kernel",
         ".",
     ],
     header_libs: [