diff options
| -rw-r--r-- | Android.mk | 9 | ||||
| -rw-r--r-- | src/native/dalvik_system_VMRuntime.cc | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index 4eac005f37..daff6cb529 100644 --- a/Android.mk +++ b/Android.mk @@ -369,22 +369,19 @@ cpplint-art: .PHONY: use-art use-art: adb root && sleep 3 - adb shell "echo dalvik.vm.lib=libart.so > /data/local.prop" - adb shell chmod 644 /data/local.prop + adb shell setprop persist.sys.dalvik.vm.lib libart.so adb reboot .PHONY: use-artd use-artd: adb root && sleep 3 - adb shell "echo dalvik.vm.lib=libartd.so > /data/local.prop" - adb shell chmod 644 /data/local.prop + adb shell setprop persist.sys.dalvik.vm.lib libartd.so adb reboot .PHONY: use-dalvik use-dalvik: adb root && sleep 3 - adb shell "echo dalvik.vm.lib=libdvm.so > /data/local.prop" - adb shell chmod 644 /data/local.prop + adb shell setprop persist.sys.dalvik.vm.lib libdvm.so adb reboot ######################################################################## diff --git a/src/native/dalvik_system_VMRuntime.cc b/src/native/dalvik_system_VMRuntime.cc index 0a2e1a69cf..ce3cc932a0 100644 --- a/src/native/dalvik_system_VMRuntime.cc +++ b/src/native/dalvik_system_VMRuntime.cc @@ -126,6 +126,10 @@ static jstring VMRuntime_vmVersion(JNIEnv* env, jobject) { return env->NewStringUTF(Runtime::Current()->GetVersion()); } +static jstring VMRuntime_vmLibrary(JNIEnv* env, jobject) { + return env->NewStringUTF(kIsDebugBuild ? "libartd.so" : "libart.so"); +} + #if !defined(ART_USE_PORTABLE_COMPILER) static void DisableCheckJniCallback(Thread* t, void*) { t->GetJniEnv()->SetCheckJniEnabled(false); @@ -209,6 +213,7 @@ static JNINativeMethod gMethods[] = { NATIVE_METHOD(VMRuntime, startJitCompilation, "()V"), NATIVE_METHOD(VMRuntime, trimHeap, "()V"), NATIVE_METHOD(VMRuntime, vmVersion, "()Ljava/lang/String;"), + NATIVE_METHOD(VMRuntime, vmLibrary, "()Ljava/lang/String;"), }; void register_dalvik_system_VMRuntime(JNIEnv* env) { |