Merge "Do not populate ro.kernel.qemu in ProcessKernelCmdline" am: e37b6f4f67 am: fddb2e3b98

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

Change-Id: I1a46aa65b1599cce7698ecaaccc4c95ac1d19282
This commit is contained in:
Treehugger Robot 2021-03-23 11:29:22 +00:00 committed by Automerger Merge Worker
commit 5189edc2c2

View file

@ -1172,7 +1172,8 @@ static void ProcessKernelCmdline() {
} else if (StartsWith(key, "qemu."sv)) {
InitPropertySet("ro.kernel." + key, value);
} else if (key == "qemu") {
InitPropertySet("ro.kernel." + key, value); // emulator specific, deprecated
// emulator specific, should be retired once emulator migrates to
// androidboot.
InitPropertySet("ro.boot." + key, value);
}
});