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

Commit 3d09a0fc authored Jul 17, 2023 by David Anderson Committed by Automerger Merge Worker Jul 17, 2023

Merge changes from topic "lpdump-snapshots" into main am: f489314d am: 245da012 am: a40afcbc

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>

parents 6d615af7 a40afcbc

fs_mgr/Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -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",

fs_mgr/libsnapshot/snapuserd/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -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",