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

Merge "Populate only emulator specific properties into ro.kernel." am: 7787e70417

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib69626710f6073da8cb1479b7d150b0c3f022144
This commit is contained in:
Roman Kiryanov 2021-03-12 06:48:56 +00:00 • committed by Automerger Merge Worker
commit 7cf1c09c6c
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
init/property_service.cpp
View file

@ -1166,21 +1166,13 @@ static void ProcessKernelDt() {
constexpr auto ANDROIDBOOT_PREFIX = "androidboot."sv;
static void ProcessKernelCmdline() {
bool for_emulator = false;
ImportKernelCmdline([&](const std::string& key, const std::string& value) {
if (key == "qemu") {
for_emulator = true;
} else if (StartsWith(key, ANDROIDBOOT_PREFIX)) {
if (StartsWith(key, ANDROIDBOOT_PREFIX)) {
InitPropertySet("ro.boot." + key.substr(ANDROIDBOOT_PREFIX.size()), value);
} else if (StartsWith(key, "qemu."sv) || (key == "qemu")) {
InitPropertySet("ro.kernel." + key, value);
}
});
if (for_emulator) {
ImportKernelCmdline([&](const std::string& key, const std::string& value) {
// In the emulator, export any kernel option with the "ro.kernel." prefix.
InitPropertySet("ro.kernel." + key, value);
});
}
}
static void ProcessBootconfig() {