jni_generator: Wrap all native methods in stubs.

base/android/jni_generator/testJarJarRemapping.golden

Index: base/android/jni_generator/testJarJarRemapping.golden
diff --git a/base/android/jni_generator/testJarJarRemapping.golden b/base/android/jni_generator/testJarJarRemapping.golden
index 2f85122a5f48d360e677af7ec217504e5ba5ff45..b626a8a1c23acf25099f0b17685eb79f8bf3e08b 100644
--- a/base/android/jni_generator/testJarJarRemapping.golden
+++ b/base/android/jni_generator/testJarJarRemapping.golden
@@ -25,19 +25,43 @@ jclass g_Example_clazz = NULL;
 
 }  // namespace
 
+// Step 2: method stubs.
+
 static void Test(JNIEnv* env, jclass jcaller,
     jobject t);
 
+static void Java_com_test_jni_1generator_Example_nativeTest(JNIEnv* env, jclass
+    jcaller,
+    jobject t) {
+  return Test(env, jcaller, t);
+}
+
 static void Test2(JNIEnv* env, jclass jcaller,
     jobject t);
 
+static void Java_com_test_jni_1generator_Example_nativeTest2(JNIEnv* env, jclass
+    jcaller,
+    jobject t) {
+  return Test2(env, jcaller, t);
+}
+
 static void Test3(JNIEnv* env, jclass jcaller,
     jobject t);
 
+static void Java_com_test_jni_1generator_Example_nativeTest3(JNIEnv* env, jclass
+    jcaller,
+    jobject t) {
+  return Test3(env, jcaller, t);
+}
+
 static void Test4(JNIEnv* env, jclass jcaller,
     jobject t);
 
-// Step 2: method stubs.
+static void Java_com_test_jni_1generator_Example_nativeTest4(JNIEnv* env, jclass
+    jcaller,
+    jobject t) {
+  return Test4(env, jcaller, t);
+}
 
 // Step 3: RegisterNatives.
 
@@ -46,22 +70,25 @@ static const JNINativeMethod kMethodsExample[] = {
 "("
 "Lorg/test2/Test;"
 ")"
-"V", reinterpret_cast<void*>(Test) },
+"V", reinterpret_cast<void*>(Java_com_test_jni_1generator_Example_nativeTest) },
     { "nativeTest2",
 "("
 "Lorg/chromium/example3/PrefixFoo;"
 ")"
-"V", reinterpret_cast<void*>(Test2) },
+"V", reinterpret_cast<void*>(Java_com_test_jni_1generator_Example_nativeTest2)
+    },
     { "nativeTest3",
 "("
 "Lorg/test3/Test;"
 ")"
-"V", reinterpret_cast<void*>(Test3) },
+"V", reinterpret_cast<void*>(Java_com_test_jni_1generator_Example_nativeTest3)
+    },
     { "nativeTest4",
 "("
 "Lorg/test3/TestBar$Inner;"
 ")"
-"V", reinterpret_cast<void*>(Test4) },
+"V", reinterpret_cast<void*>(Java_com_test_jni_1generator_Example_nativeTest4)
+    },
 };
 
 static bool RegisterNativesImpl(JNIEnv* env) {