snapuserd: Don't statically link outside of ramdisk.

Also, remove snapuserd from the vendor ramdisk since this isn't used
anymore.

Bug: 345158294
Test: ldd snapuserd_ramdisk and system/bin/snapuserd
      apply full OTA on aosp_cf
Change-Id: I2c2ad1458d67a8449c548e22660f523ba9c86849
This commit is contained in:
David Anderson 2024-06-13 01:28:35 +00:00
parent 283b2037ce
commit c9fa93f4e8

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 {