Updating JNIAdditionalImport to allow more than one import.

base/android/jni_generator/testJNIAdditionalImport.golden

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file is autogenerated by
 //     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/foo/Foo
 
 #ifndef org_chromium_foo_Foo_JNI
 #define org_chromium_foo_Foo_JNI
 
 #include <jni.h>
 
 #include "base/android/jni_generator/jni_generator_helper.h"
 
 #include "base/android/jni_int_wrapper.h"
 
 // Step 1: forward declarations.
 namespace {
 const char kFooClassPath[] = "org/chromium/foo/Foo";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
 jclass g_Foo_clazz = NULL;
 
 }  // namespace
 
 static void DoSomething(JNIEnv* env, jclass jcaller,
     jobject callback);
 
+static void DoSomething(JNIEnv* env, jclass jcaller,
+    jobject callback1,
+    jobject callback2);
+
 // Step 2: method stubs.
 
-static base::subtle::AtomicWord g_Foo_calledByNative = 0;
-static void Java_Foo_calledByNative(JNIEnv* env, jobject callback) {
+static base::subtle::AtomicWord g_Foo_calledByNativeV_OCFBC = 0;
+static void Java_Foo_calledByNativeV_OCFBC(JNIEnv* env, jobject callback) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, g_Foo_clazz,
       g_Foo_clazz);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
       env, g_Foo_clazz,
       "calledByNative",
 
 "("
 "Lorg/chromium/foo/Bar$Callback;"
 ")"
 "V",
-      &g_Foo_calledByNative);
+      &g_Foo_calledByNativeV_OCFBC);
 
      env->CallStaticVoidMethod(g_Foo_clazz,
           method_id, callback);
   jni_generator::CheckException(env);
 
 }
 
+static base::subtle::AtomicWord g_Foo_calledByNativeV_OCFBC_OCFBC = 0;
+static void Java_Foo_calledByNativeV_OCFBC_OCFBC(JNIEnv* env, jobject callback1,
+    jobject callback2) {
+  /* Must call RegisterNativesImpl()  */
+  CHECK_CLAZZ(env, g_Foo_clazz,
+      g_Foo_clazz);
+  jmethodID method_id =
+      base::android::MethodID::LazyGet<
+      base::android::MethodID::TYPE_STATIC>(
+      env, g_Foo_clazz,

[bulach, 2014/05/22 17:13:45]

as above, this g_Foo_clazz is wrong, but that's just an artifact of the test
data... if we split the test, the generated code will be correct. similarly for
the "V_OCFBC_OCFBC" mangled suffix..

[qsr, 2014/05/23 08:11:38]

Done.

+      "calledByNative",
+
+"("
+"Lorg/chromium/foo/Bar2$Callback;"
+"Lorg/chromium/foo/Bar3$Callback;"
+")"
+"V",
+      &g_Foo_calledByNativeV_OCFBC_OCFBC);
+
+     env->CallStaticVoidMethod(g_Foo_clazz,
+          method_id, callback1, callback2);
+  jni_generator::CheckException(env);
+
+}
+
 // Step 3: RegisterNatives.
 
 static const JNINativeMethod kMethodsFoo[] = {
     { "nativeDoSomething",
 "("
 "Lorg/chromium/foo/Bar$Callback;"
 ")"
 "V", reinterpret_cast<void*>(DoSomething) },
+    { "nativeDoSomething",
+"("
+"Lorg/chromium/foo/Bar2$Callback;"
+"Lorg/chromium/foo/Bar3$Callback;"
+")"
+"V", reinterpret_cast<void*>(DoSomething) },
 };
 
 static bool RegisterNativesImpl(JNIEnv* env) {
   g_Foo_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
       base::android::GetClass(env, kFooClassPath).obj()));
 
   const int kMethodsFooSize = arraysize(kMethodsFoo);
 
   if (env->RegisterNatives(g_Foo_clazz,
                            kMethodsFoo,
                            kMethodsFooSize) < 0) {
     jni_generator::HandleRegistrationError(
         env, g_Foo_clazz, __FILE__);
     return false;
   }
 
   return true;
 }
 
 #endif  // org_chromium_foo_Foo_JNI