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

Revert "snapuserd: Don't statically link outside of ramdisk."

Browse source 
This reverts commit c9fa93f4e8.

Reason for revert: b/347670914
Bug: 347670914
(cherry picked from https://android-review.googlesource.com/q/commit:14fbf6d3909dab706568d1c409a941d5fd2a7428)
Merged-In: I9d63a69ccf1f8de98ab7cc23b9fbf400863cddfb
Change-Id: I9d63a69ccf1f8de98ab7cc23b9fbf400863cddfb
This commit is contained in:
David Anderson 2024-06-17 19:05:13 +00:00 committed by Android Build Coastguard Worker
parent c8d22b249c
commit aaf11ec896
1 changed files with 10 additions and 11 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,6 +145,14 @@ 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 {
@ -157,10 +165,10 @@ cc_binary {
"libsnapuserd_client",
],
ramdisk_available: false,
vendor_ramdisk_available: false,
vendor_ramdisk_available: true,
}
// 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.
@ -176,15 +184,6 @@ 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 {