Merge "Populate ro.boot.qemu for the emulator device" am: dce1f88bfb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic21c83a1ef590f19364181cd1e584ebabc2433b7
This commit is contained in:
Roman Kiryanov 2021-03-12 06:49:28 +00:00 committed by Automerger Merge Worker
commit b132468af1

View file

@ -1169,8 +1169,11 @@ static void ProcessKernelCmdline() {
ImportKernelCmdline([&](const std::string& key, const std::string& value) {
if (StartsWith(key, ANDROIDBOOT_PREFIX)) {
InitPropertySet("ro.boot." + key.substr(ANDROIDBOOT_PREFIX.size()), value);
} else if (StartsWith(key, "qemu."sv) || (key == "qemu")) {
} else if (StartsWith(key, "qemu."sv)) {
InitPropertySet("ro.kernel." + key, value);
} else if (key == "qemu") {
InitPropertySet("ro.kernel." + key, value); // emulator specific, deprecated
InitPropertySet("ro.boot." + key, value);
}
});
}