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

Snap for 11973804 from fa57c11e10 to 24Q3-release

Browse source 
Change-Id: Iad5d64933596101a7d98b44d6c945ab6a9980935
This commit is contained in:
Android Build Coastguard Worker 2024-06-15 01:25:03 +00:00
commit c8d22b249c
2 changed files with 14 additions and 12 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 {

5
init/apex_init_util.cpp
View file

@ -107,8 +107,9 @@ static Result<void> ParseRcScripts(const std::vector<std::string>& files) {
}
// APEXes can have versioned RC files. These should be filtered based on
// SDK version.
auto filtered = FilterVersionedConfigs(
files, android::base::GetIntProperty("ro.build.version.sdk", INT_MAX));
int sdk = android::base::GetIntProperty("ro.build.version.sdk", INT_MAX);
if (sdk < 35) sdk = 35; // aosp/main merges only into sdk=35+ (ie. __ANDROID_API_V__+)
auto filtered = FilterVersionedConfigs(files, sdk);
if (filtered.empty()) {
return {};
}