diff options
Diffstat (limited to 'luni/src/main')
| -rw-r--r-- | luni/src/main/java/java/lang/System.java | 7 | ||||
| -rw-r--r-- | luni/src/main/native/java_lang_System.cpp | 13 |
2 files changed, 6 insertions, 14 deletions
diff --git a/luni/src/main/java/java/lang/System.java b/luni/src/main/java/java/lang/System.java index bed9de6..e79f844 100644 --- a/luni/src/main/java/java/lang/System.java +++ b/luni/src/main/java/java/lang/System.java @@ -1176,7 +1176,12 @@ public final class System { * named by the argument. On Android, this would turn {@code "MyLibrary"} into * {@code "libMyLibrary.so"}. */ - public static native String mapLibraryName(String nickname); + public static String mapLibraryName(String nickname) { + if (nickname == null) { + throw new NullPointerException("nickname == null"); + } + return "lib" + nickname + ".so"; + } /** * Used to set System.err, System.in, and System.out. diff --git a/luni/src/main/native/java_lang_System.cpp b/luni/src/main/native/java_lang_System.cpp index 3b995e7..306adab 100644 --- a/luni/src/main/native/java_lang_System.cpp +++ b/luni/src/main/native/java_lang_System.cpp @@ -124,22 +124,9 @@ static jlong System_nanoTime(JNIEnv*, jclass) { #endif } -static jstring System_mapLibraryName(JNIEnv* env, jclass, jstring javaName) { - ScopedUtfChars name(env, javaName); - if (name.c_str() == NULL) { - return NULL; - } - char* mappedName = NULL; - asprintf(&mappedName, "lib%s.so", name.c_str()); - jstring result = env->NewStringUTF(mappedName); - free(mappedName); - return result; -} - static JNINativeMethod gMethods[] = { NATIVE_METHOD(System, currentTimeMillis, "!()J"), NATIVE_METHOD(System, log, "(CLjava/lang/String;Ljava/lang/Throwable;)V"), - NATIVE_METHOD(System, mapLibraryName, "(Ljava/lang/String;)Ljava/lang/String;"), NATIVE_METHOD(System, nanoTime, "!()J"), NATIVE_METHOD(System, setFieldImpl, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V"), NATIVE_METHOD(System, specialProperties, "()[Ljava/lang/String;"), |