Enforce using the Dalvik runtime library

As ART is not supported (yet?), disable it when Xposed is active to avoid bootloops.
novic · Nov 22, 2013 · ebc0eac · ebc0eac
1 parent 04c1d3c
commit ebc0eac
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/app_main.cpp b/app_main.cpp
@@ -259,6 +259,7 @@ int main(int argc, char* const argv[])
     runtime.mParentDir = parentDir;
 
     xposedInfo();
+    xposedEnforceDalvik();
     keepLoadingXposed = !isXposedDisabled() && !xposedShouldIgnoreCommand(className, argc, argv) && addXposedToClasspath(zygote);
 
     if (zygote) {

diff --git a/xposed.cpp b/xposed.cpp
@@ -24,6 +24,8 @@
 
 #include "xposed_offsets.h"
 
+extern int RUNNING_PLATFORM_SDK_VERSION;
+
 
 namespace android {
 
@@ -65,6 +67,18 @@ void xposedInfo() {
     ALOGD("ROM: %s\n", rom);
 }
 
+void xposedEnforceDalvik() {
+    if (RUNNING_PLATFORM_SDK_VERSION < 19)
+        return;
+
+    char runtime[PROPERTY_VALUE_MAX];
+    property_get("persist.sys.dalvik.vm.lib", runtime, "");
+    if (strcmp(runtime, "libdvm.so") != 0) {
+        ALOGE("Unsupported runtime library %s, setting to libdvm.so", runtime);
+        property_set("persist.sys.dalvik.vm.lib", "libdvm.so");
+    }
+}
+
 bool isXposedDisabled() {
     // is the blocker file present?
     if (access(XPOSED_LOAD_BLOCKER, F_OK) == 0) {

diff --git a/xposed.h b/xposed.h
@@ -40,6 +40,7 @@ struct XposedHookInfo {
 
 // called directoy by app_process
 void xposedInfo();
+void xposedEnforceDalvik();
 bool isXposedDisabled();
 bool xposedShouldIgnoreCommand(const char* className, int argc, const char* const argv[]);
 bool addXposedToClasspath(bool zygote);