ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Change-Id: Ia5a02d3a6a9a3ef91d4a2f9282b78da93f481c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Anderson 2023-07-17 17:37:26 +00:00 • committed by Automerger Merge Worker
commit 245da0124a
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs_mgr/Android.bp
View file

@ -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",

1
fs_mgr/libsnapshot/snapuserd/Android.bp
View file

@ -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",