Make class lookup lazy in jni_generator when using lazy method lookup.

base/android/jni_generator/golden_sample_for_tests_jni.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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/example/jni_generator/SampleForTests
 
 #ifndef org_chromium_example_jni_generator_SampleForTests_JNI
 #define org_chromium_example_jni_generator_SampleForTests_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 kInnerStructAClassPath[] =
     "org/chromium/example/jni_generator/SampleForTests$InnerStructA";
 const char kSampleForTestsClassPath[] =
     "org/chromium/example/jni_generator/SampleForTests";
 const char kInnerStructBClassPath[] =
     "org/chromium/example/jni_generator/SampleForTests$InnerStructB";
+#if __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-function"
+#endif
 // Leaking this jclass as we cannot use LazyInstance from some threads.
 jclass g_InnerStructA_clazz = NULL;
+jclass InnerStructA_clazz(JNIEnv*) { return g_InnerStructA_clazz; }
 // Leaking this jclass as we cannot use LazyInstance from some threads.
 jclass g_SampleForTests_clazz = NULL;
+jclass SampleForTests_clazz(JNIEnv*) { return g_SampleForTests_clazz; }
 // Leaking this jclass as we cannot use LazyInstance from some threads.
 jclass g_InnerStructB_clazz = NULL;
+jclass InnerStructB_clazz(JNIEnv*) { return g_InnerStructB_clazz; }
+#if __clang__
+#pragma clang diagnostic pop
+#endif
 
 }  // namespace
 
 namespace base {
 namespace android {
 
 static jlong Init(JNIEnv* env, jobject jcaller,
     jstring param);
 
 static jdouble GetDoubleFunction(JNIEnv* env, jobject jcaller);
@@ skipping 49 matching lines @@
   CHECK_NATIVE_PTR(env, jcaller, native, "ReturnAString", NULL);
   return native->ReturnAString(env, jcaller).Release();
 }
 
 static base::subtle::AtomicWord g_SampleForTests_javaMethod = 0;
 static jint Java_SampleForTests_javaMethod(JNIEnv* env, jobject obj,
     JniIntWrapper foo,
     JniIntWrapper bar) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
-      g_SampleForTests_clazz, 0);
+      SampleForTests_clazz(env), 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
-      env, g_SampleForTests_clazz,
+      env, SampleForTests_clazz(env),
       "javaMethod",
 
 "("
 "I"
 "I"
 ")"
 "I",
       &g_SampleForTests_javaMethod);
 
   jint ret =
       env->CallIntMethod(obj,
           method_id, as_jint(foo), as_jint(bar));
   jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_SampleForTests_staticJavaMethod = 0;
 static jboolean Java_SampleForTests_staticJavaMethod(JNIEnv* env) {
   /* Must call RegisterNativesImpl()  */
-  CHECK_CLAZZ(env, g_SampleForTests_clazz,
-      g_SampleForTests_clazz, false);
+  CHECK_CLAZZ(env, SampleForTests_clazz(env),
+      SampleForTests_clazz(env), false);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
-      env, g_SampleForTests_clazz,
+      env, SampleForTests_clazz(env),
       "staticJavaMethod",
 
 "("
 ")"
 "Z",
       &g_SampleForTests_staticJavaMethod);
 
   jboolean ret =
-      env->CallStaticBooleanMethod(g_SampleForTests_clazz,
+      env->CallStaticBooleanMethod(SampleForTests_clazz(env),
           method_id);
   jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_SampleForTests_packagePrivateJavaMethod = 0;
 static void Java_SampleForTests_packagePrivateJavaMethod(JNIEnv* env, jobject
     obj) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
-      g_SampleForTests_clazz);
+      SampleForTests_clazz(env));
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
-      env, g_SampleForTests_clazz,
+      env, SampleForTests_clazz(env),
       "packagePrivateJavaMethod",
 
 "("
 ")"
 "V",
       &g_SampleForTests_packagePrivateJavaMethod);
 
      env->CallVoidMethod(obj,
           method_id);
   jni_generator::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_SampleForTests_methodThatThrowsException = 0;
 static void Java_SampleForTests_methodThatThrowsException(JNIEnv* env, jobject
     obj) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
-      g_SampleForTests_clazz);
+      SampleForTests_clazz(env));
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
-      env, g_SampleForTests_clazz,
+      env, SampleForTests_clazz(env),
       "methodThatThrowsException",
 
 "("
 ")"
 "V",
       &g_SampleForTests_methodThatThrowsException);
 
      env->CallVoidMethod(obj,
           method_id);
 
 }
 
 static base::subtle::AtomicWord g_InnerStructA_create = 0;
 static base::android::ScopedJavaLocalRef<jobject>
     Java_InnerStructA_create(JNIEnv* env, jlong l,
     JniIntWrapper i,
     jstring s) {
   /* Must call RegisterNativesImpl()  */
-  CHECK_CLAZZ(env, g_InnerStructA_clazz,
-      g_InnerStructA_clazz, NULL);
+  CHECK_CLAZZ(env, InnerStructA_clazz(env),
+      InnerStructA_clazz(env), NULL);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
-      env, g_InnerStructA_clazz,
+      env, InnerStructA_clazz(env),
       "create",
 
 "("
 "J"
 "I"
 "Ljava/lang/String;"
 ")"
 "Lorg/chromium/example/jni_generator/SampleForTests$InnerStructA;",
       &g_InnerStructA_create);
 
   jobject ret =
-      env->CallStaticObjectMethod(g_InnerStructA_clazz,
+      env->CallStaticObjectMethod(InnerStructA_clazz(env),
           method_id, l, as_jint(i), s);
   jni_generator::CheckException(env);
   return base::android::ScopedJavaLocalRef<jobject>(env, ret);
 }
 
 static base::subtle::AtomicWord g_SampleForTests_addStructA = 0;
 static void Java_SampleForTests_addStructA(JNIEnv* env, jobject obj, jobject a)
     {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
-      g_SampleForTests_clazz);
+      SampleForTests_clazz(env));
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
-      env, g_SampleForTests_clazz,
+      env, SampleForTests_clazz(env),
       "addStructA",
 
 "("
 "Lorg/chromium/example/jni_generator/SampleForTests$InnerStructA;"
 ")"
 "V",
       &g_SampleForTests_addStructA);
 
      env->CallVoidMethod(obj,
           method_id, a);
   jni_generator::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_SampleForTests_iterateAndDoSomething = 0;
 static void Java_SampleForTests_iterateAndDoSomething(JNIEnv* env, jobject obj)
     {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
-      g_SampleForTests_clazz);
+      SampleForTests_clazz(env));
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
-      env, g_SampleForTests_clazz,
+      env, SampleForTests_clazz(env),
       "iterateAndDoSomething",
 
 "("
 ")"
 "V",
       &g_SampleForTests_iterateAndDoSomething);
 
      env->CallVoidMethod(obj,
           method_id);
   jni_generator::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_InnerStructB_getKey = 0;
 static jlong Java_InnerStructB_getKey(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
-      g_InnerStructB_clazz, 0);
+      InnerStructB_clazz(env), 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
-      env, g_InnerStructB_clazz,
+      env, InnerStructB_clazz(env),
       "getKey",
 
 "("
 ")"
 "J",
       &g_InnerStructB_getKey);
 
   jlong ret =
       env->CallLongMethod(obj,
           method_id);
   jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InnerStructB_getValue = 0;
 static base::android::ScopedJavaLocalRef<jstring>
     Java_InnerStructB_getValue(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
-      g_InnerStructB_clazz, NULL);
+      InnerStructB_clazz(env), NULL);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
-      env, g_InnerStructB_clazz,
+      env, InnerStructB_clazz(env),
       "getValue",
 
 "("
 ")"
 "Ljava/lang/String;",
       &g_InnerStructB_getValue);
 
   jstring ret =
       static_cast<jstring>(env->CallObjectMethod(obj,
           method_id));
@@ skipping 62 matching lines @@
 static bool RegisterNativesImpl(JNIEnv* env) {
   g_InnerStructA_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
       base::android::GetClass(env, kInnerStructAClassPath).obj()));
   g_SampleForTests_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
       base::android::GetClass(env, kSampleForTestsClassPath).obj()));
   g_InnerStructB_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
       base::android::GetClass(env, kInnerStructBClassPath).obj()));
 
   const int kMethodsSampleForTestsSize = arraysize(kMethodsSampleForTests);
 
-  if (env->RegisterNatives(g_SampleForTests_clazz,
+  if (env->RegisterNatives(SampleForTests_clazz(env),
                            kMethodsSampleForTests,
                            kMethodsSampleForTestsSize) < 0) {
     jni_generator::HandleRegistrationError(
-        env, g_SampleForTests_clazz, __FILE__);
+        env, SampleForTests_clazz(env), __FILE__);
     return false;
   }
 
   return true;
 }
 
 }  // namespace android
 }  // namespace base
 
 #endif  // org_chromium_example_jni_generator_SampleForTests_JNI