commit 4a47c74b7526ed5da00bbcdb45929c91058f020a
author Roman Kiryanov <rkir@google.com> Tue Mar 09 17:05:26 2021 -0800
committer Roman Kiryanov <rkir@google.com> Thu Mar 11 16:49:17 2021 -0800
tree 4ccf316947300268d1ed5c7699ace69557363268
parent 1a705d49431fd649e0218d0af8680ccbb7fd4b9e

Populate `ro.boot.qemu` for the emulator device

Bug: 182291166
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ied78f42363c1f6580fe6e5660b14c257960aed98

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index ad448c8..382f430 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -1169,8 +1169,11 @@
     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);
         }
     });
 }