commit 350b626eb1cfbaee7619e9453a4c018c07aed003
author Calin Juravle <calin@google.com> Wed Jul 16 17:55:55 2014 +0100
committer Narayan Kamath <narayan@google.com> Fri Jul 25 14:52:47 2014 +0100
tree f2994cca6435c728c9f041dc9e9a7ec64f106398
parent e2f654a463976f811c5358fc0de68c0492601274

Rename openDexFileNative to openDexFile.

We no longer need two distinct methods.

Bug: 15563230

(cherry picked from commit 8edcb9c8bc62fcbd181e136c32086f2b970306a4)

Change-Id: Ib95098af0dd26733b5946d8e24ae4dfbcdbec3ba

runtime/native/dalvik_system_DexFile.cc

diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc
index 440d3d0..ac1a310 100644
--- a/runtime/native/dalvik_system_DexFile.cc
+++ b/runtime/native/dalvik_system_DexFile.cc
@@ -97,7 +97,7 @@
   void operator=(const NullableScopedUtfChars&);
 };
 
-static jlong DexFile_openDexFileNative(JNIEnv* env, jclass, jstring javaSourceName, jstring javaOutputName, jint) {
+static jlong DexFile_openDexFile(JNIEnv* env, jclass, jstring javaSourceName, jstring javaOutputName, jint) {
   ScopedUtfChars sourceName(env, javaSourceName);
   if (sourceName.c_str() == NULL) {
     return 0;
@@ -498,7 +498,7 @@
   NATIVE_METHOD(DexFile, getClassNameList, "(J)[Ljava/lang/String;"),
   NATIVE_METHOD(DexFile, isDexOptNeeded, "(Ljava/lang/String;)Z"),
   NATIVE_METHOD(DexFile, isDexOptNeededInternal, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Z"),
-  NATIVE_METHOD(DexFile, openDexFileNative, "(Ljava/lang/String;Ljava/lang/String;I)J"),
+  NATIVE_METHOD(DexFile, openDexFile, "(Ljava/lang/String;Ljava/lang/String;I)J"),
 };
 
 void register_dalvik_system_DexFile(JNIEnv* env) {