Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07339000 authored Jul 14, 2023 by David Anderson

Remove local_include_dirs from fs_mgr_defaults.

fs_mgr_defaults gets used in lots of places, propagate
local_include_dirs to where it's needed so it doesn't cause problems on
modules that don't have an "includes" directory.

Bug: 291083311
Test: builds
Change-Id: Ief2f6362f584b99d3e2dc7dc1b46450609ad189d

parent a71faae8

fs_mgr/Android.bp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,6 @@ cc_defaults {
	sanitize: {		sanitize: {
	misc_undefined: ["integer"],		misc_undefined: ["integer"],
	},		},
	local_include_dirs: ["include/"],
	cflags: [		cflags: [
	"-Wall",		"-Wall",
	"-Werror",		"-Werror",
	@@ -60,6 +59,7 @@ cc_defaults {
	name: "libfs_mgr_defaults",		name: "libfs_mgr_defaults",
	defaults: ["fs_mgr_defaults"],		defaults: ["fs_mgr_defaults"],
	export_include_dirs: ["include"],		export_include_dirs: ["include"],
			local_include_dirs: ["include/"],
	include_dirs: ["system/vold"],		include_dirs: ["system/vold"],
	cflags: [		cflags: [
	"-D_FILE_OFFSET_BITS=64",		"-D_FILE_OFFSET_BITS=64",
	@@ -188,6 +188,7 @@ cc_library_static {
	],		],
	host_supported: true,		host_supported: true,
	defaults: ["fs_mgr_defaults"],		defaults: ["fs_mgr_defaults"],
			local_include_dirs: ["include/"],
	srcs: [		srcs: [
	"fs_mgr_fstab.cpp",		"fs_mgr_fstab.cpp",
	"fs_mgr_boot_config.cpp",		"fs_mgr_boot_config.cpp",

fs_mgr/libsnapshot/snapuserd/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,7 @@ cc_library_static {
	defaults: [		defaults: [
	"fs_mgr_defaults",		"fs_mgr_defaults",
	],		],
			local_include_dirs: ["include/"],
	srcs: [		srcs: [
	"dm-snapshot-merge/snapuserd.cpp",		"dm-snapshot-merge/snapuserd.cpp",
	"dm-snapshot-merge/snapuserd_worker.cpp",		"dm-snapshot-merge/snapuserd_worker.cpp",