commit 3d09a0fc53bf3c126bd63028c125f9a5b7708ee5
author David Anderson <dvander@google.com> Mon Jul 17 19:07:35 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 17 19:07:35 2023 +0000
tree d34791ecbaba447120ad5093b99a50308f6da74c
parent 6d615af7f27ecd70455bbff0dd26f233df97f7aa
parent a40afcbc85a5a54394eb3d380b48db39ecd559ca

Merge changes from topic "lpdump-snapshots" into main am: f489314dec am: 245da0124a am: a40afcbc85

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

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

fs_mgr/Android.bp

diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp
index 15600fd..0a836e4 100644
--- a/fs_mgr/Android.bp
+++ b/fs_mgr/Android.bp
@@ -49,7 +49,6 @@
     sanitize: {
         misc_undefined: ["integer"],
     },
-    local_include_dirs: ["include/"],
     cflags: [
         "-Wall",
         "-Werror",
@@ -60,6 +59,7 @@
     name: "libfs_mgr_defaults",
     defaults: ["fs_mgr_defaults"],
     export_include_dirs: ["include"],
+    local_include_dirs: ["include/"],
     include_dirs: ["system/vold"],
     cflags: [
         "-D_FILE_OFFSET_BITS=64",
@@ -188,6 +188,7 @@
     ],
     host_supported: true,
     defaults: ["fs_mgr_defaults"],
+    local_include_dirs: ["include/"],
     srcs: [
         "fs_mgr_fstab.cpp",
         "fs_mgr_boot_config.cpp",

fs_mgr/libsnapshot/snapuserd/Android.bp

diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp
index 9fe567a..e5b561b 100644
--- a/fs_mgr/libsnapshot/snapuserd/Android.bp
+++ b/fs_mgr/libsnapshot/snapuserd/Android.bp
@@ -57,6 +57,7 @@
     defaults: [
         "fs_mgr_defaults",
     ],
+    local_include_dirs: ["include/"],
     srcs: [
         "dm-snapshot-merge/snapuserd.cpp",
         "dm-snapshot-merge/snapuserd_worker.cpp",