Index: base/android/jni_generator/testFromJavaPGenerics.golden |
diff --git a/base/android/jni_generator/testFromJavaPGenerics.golden b/base/android/jni_generator/testFromJavaPGenerics.golden |
index 48582fdb21d4d11d8ac7360a7c233aeb6f802a86..e4df7697a5a5007f432fe4daac19eb7a6d92ba47 100644 |
--- a/base/android/jni_generator/testFromJavaPGenerics.golden |
+++ b/base/android/jni_generator/testFromJavaPGenerics.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 kHashSetClassPath[] = "java/util/HashSet"; |
+#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_HashSet_clazz = NULL; |
+jclass HashSet_clazz(JNIEnv*) { return g_HashSet_clazz; } |
+#if __clang__ |
+#pragma clang diagnostic pop |
+#endif |
} // namespace |
@@ -34,11 +42,11 @@ static void Java_HashSet_dummy(JNIEnv* env, jobject obj) __attribute__ |
static void Java_HashSet_dummy(JNIEnv* env, jobject obj) { |
/* Must call RegisterNativesImpl() */ |
CHECK_CLAZZ(env, obj, |
- g_HashSet_clazz); |
+ HashSet_clazz(env)); |
jmethodID method_id = |
base::android::MethodID::LazyGet< |
base::android::MethodID::TYPE_INSTANCE>( |
- env, g_HashSet_clazz, |
+ env, HashSet_clazz(env), |
"dummy", |
"()V", |
&g_HashSet_dummy); |