Merge "Populate `ro.boot.dalvik.vm.checkjni` from `android.checkjni`" am: cd52a78472

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

Change-Id: I446bb76914b91ad277455138cc86f35961d60ca1

1 files changed, 12 insertions, 0 deletions

diff --git a/init/property_service.cpp b/init/property_service.cpp
index d1ba3c7ea..c2eb73c61 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -1204,6 +1204,18 @@ static void ProcessKernelCmdline() {
             // emulator specific, should be retired once emulator migrates to
             // androidboot.
             InitPropertySet("ro.boot.debug.sf.nobootanimation", "1");
+        } else if (key == "android.checkjni") {
+            // emulator specific, should be retired once emulator migrates to
+            // androidboot.
+            std::string value_bool;
+            if (value == "0") {
+                value_bool = "false";
+            } else if (value == "1") {
+                value_bool = "true";
+            } else {
+                value_bool = value;
+            }
+            InitPropertySet("ro.boot.dalvik.vm.checkjni", value_bool);
         }
     });
 }