tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "snapuserd: Don't statically link outside of ramdisk." into main am: 2119b10f6f

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

Change-Id: I1b6c192139d2bf3961e3c6a6e8049471b6537e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Anderson 2024-06-14 00:34:52 +00:00 committed by Automerger Merge Worker
commit 35ca9086e1
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -145,14 +145,6 @@ cc_defaults {
],
include_dirs: ["bionic/libc/kernel"],
system_shared_libs: [],
// snapuserd is started during early boot by first-stage init. At that
// point, /system is mounted using the "dm-user" device-mapper kernel
// module. dm-user routes all I/O to userspace to be handled by
// snapuserd, which would lead to deadlock if we had to handle page
// faults for its code pages.
static_executable: true,
}
cc_binary {
@ -165,10 +157,10 @@ cc_binary {
"libsnapuserd_client",
],
ramdisk_available: false,
vendor_ramdisk_available: true,
vendor_ramdisk_available: false,
}
// This target will install to /system/bin/snapuserd_ramdisk
// This target will install to /system/bin/snapuserd_ramdisk
// It will also create a symblink on /system/bin/snapuserd that point to
// /system/bin/snapuserd_ramdisk .
// This way, init can check if generic ramdisk copy exists.
@ -184,6 +176,15 @@ cc_binary {
vendor_ramdisk_available: false,
ramdisk: true,
symlinks: ["snapuserd"],
system_shared_libs: [],
// snapuserd is started during early boot by first-stage init. At that
// point, /system is mounted using the "dm-user" device-mapper kernel
// module. dm-user routes all I/O to userspace to be handled by
// snapuserd, which would lead to deadlock if we had to handle page
// faults for its code pages.
static_executable: true,
}
cc_defaults {