Index: base/android/jni_generator/testJarJarRemapping.golden |
diff --git a/base/android/jni_generator/testJarJarRemapping.golden b/base/android/jni_generator/testJarJarRemapping.golden |
index 9b2c0b3fc67e31d6b12ddaca9d8052f948ade8b3..3325db078da82c5c8ba85a4c43e9f7ca882865fa 100644 |
--- a/base/android/jni_generator/testJarJarRemapping.golden |
+++ b/base/android/jni_generator/testJarJarRemapping.golden |
@@ -1,4 +1,4 @@ |
-// 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. |
@@ -19,8 +19,16 @@ |
// Step 1: forward declarations. |
namespace { |
const char kExampleClassPath[] = "com/test/jni_generator/Example"; |
+#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_Example_clazz = NULL; |
+jclass Example_clazz(JNIEnv*) { return g_Example_clazz; } |
+#if __clang__ |
+#pragma clang diagnostic pop |
+#endif |
} // namespace |
@@ -69,11 +77,11 @@ static bool RegisterNativesImpl(JNIEnv* env) { |
const int kMethodsExampleSize = arraysize(kMethodsExample); |
- if (env->RegisterNatives(g_Example_clazz, |
+ if (env->RegisterNatives(Example_clazz(env), |
kMethodsExample, |
kMethodsExampleSize) < 0) { |
jni_generator::HandleRegistrationError( |
- env, g_Example_clazz, __FILE__); |
+ env, Example_clazz(env), __FILE__); |
return false; |
} |