diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp index 15600fd40..0a836e432 100644 --- a/fs_mgr/Android.bp +++ b/fs_mgr/Android.bp @@ -49,7 +49,6 @@ cc_defaults { sanitize: { misc_undefined: ["integer"], }, - local_include_dirs: ["include/"], cflags: [ "-Wall", "-Werror", @@ -60,6 +59,7 @@ cc_defaults { 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 @@ cc_library_static { ], host_supported: true, defaults: ["fs_mgr_defaults"], + local_include_dirs: ["include/"], srcs: [ "fs_mgr_fstab.cpp", "fs_mgr_boot_config.cpp", diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp index 9fe567acb..e5b561b68 100644 --- a/fs_mgr/libsnapshot/snapuserd/Android.bp +++ b/fs_mgr/libsnapshot/snapuserd/Android.bp @@ -57,6 +57,7 @@ cc_library_static { defaults: [ "fs_mgr_defaults", ], + local_include_dirs: ["include/"], srcs: [ "dm-snapshot-merge/snapuserd.cpp", "dm-snapshot-merge/snapuserd_worker.cpp",