summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAnwar Ghuloum <anwarg@google.com>2013-07-01 14:22:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-01 14:22:52 +0000
commit3e089ee6ef1e33c5ff6405b209c4f14a123c0e7e (patch)
treee97a54ca8142f2e2b64e1cdd87b1267d319f711f /src
parentc1cea9c8beaba59461a8b1efe159af2f46fcd1a3 (diff)
parentcef450c613d8324db7c418130596182b8e9a5cdd (diff)
downloadandroid_art-3e089ee6ef1e33c5ff6405b209c4f14a123c0e7e.tar.gz
android_art-3e089ee6ef1e33c5ff6405b209c4f14a123c0e7e.tar.bz2
android_art-3e089ee6ef1e33c5ff6405b209c4f14a123c0e7e.zip
Merge "add dalvik.system.VMRuntime.vmLibrary implementation for ART" into dalvik-dev
Diffstat (limited to 'src')
-rw-r--r--src/native/dalvik_system_VMRuntime.cc5
1 files changed, 5 insertions, 0 deletions
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) {