Index: base/android/jni_generator/testFromJavaP.golden |
diff --git a/base/android/jni_generator/testFromJavaP.golden b/base/android/jni_generator/testFromJavaP.golden |
index 34e21184316c509145af4282690cba8814206eb5..29364b38047d2395fa8e27fa2536b9b646d5c501 100644 |
--- a/base/android/jni_generator/testFromJavaP.golden |
+++ b/base/android/jni_generator/testFromJavaP.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 kInputStreamClassPath[] = "java/io/InputStream"; |
+#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_InputStream_clazz = NULL; |
+jclass InputStream_clazz(JNIEnv*) { return g_InputStream_clazz; } |
+#if __clang__ |
+#pragma clang diagnostic pop |
+#endif |
} // namespace |
@@ -34,11 +42,11 @@ static jint Java_InputStream_available(JNIEnv* env, jobject obj) __attribute__ |
static jint Java_InputStream_available(JNIEnv* env, jobject obj) { |
/* Must call RegisterNativesImpl() */ |
CHECK_CLAZZ(env, obj, |
- g_InputStream_clazz, 0); |
+ InputStream_clazz(env), 0); |
jmethodID method_id = |
base::android::MethodID::LazyGet< |
base::android::MethodID::TYPE_INSTANCE>( |
- env, g_InputStream_clazz, |
+ env, InputStream_clazz(env), |
"available", |
"()I", |
&g_InputStream_available); |
@@ -56,11 +64,11 @@ static void Java_InputStream_close(JNIEnv* env, jobject obj) __attribute__ |
static void Java_InputStream_close(JNIEnv* env, jobject obj) { |
/* Must call RegisterNativesImpl() */ |
CHECK_CLAZZ(env, obj, |
- g_InputStream_clazz); |
+ InputStream_clazz(env)); |
jmethodID method_id = |
base::android::MethodID::LazyGet< |
base::android::MethodID::TYPE_INSTANCE>( |
- env, g_InputStream_clazz, |
+ env, InputStream_clazz(env), |
"close", |
"()V", |
&g_InputStream_close); |
@@ -77,11 +85,11 @@ static void Java_InputStream_mark(JNIEnv* env, jobject obj, JniIntWrapper p0) |
static void Java_InputStream_mark(JNIEnv* env, jobject obj, JniIntWrapper p0) { |
/* Must call RegisterNativesImpl() */ |
CHECK_CLAZZ(env, obj, |
- g_InputStream_clazz); |
+ InputStream_clazz(env)); |
jmethodID method_id = |
base::android::MethodID::LazyGet< |
base::android::MethodID::TYPE_INSTANCE>( |
- env, g_InputStream_clazz, |
+ env, InputStream_clazz(env), |
"mark", |
"(I)V", |
&g_InputStream_mark); |
@@ -98,11 +106,11 @@ static jboolean Java_InputStream_markSupported(JNIEnv* env, jobject obj) |
static jboolean Java_InputStream_markSupported(JNIEnv* env, jobject obj) { |
/* Must call RegisterNativesImpl() */ |
CHECK_CLAZZ(env, obj, |
- g_InputStream_clazz, false); |
+ InputStream_clazz(env), false); |
jmethodID method_id = |
base::android::MethodID::LazyGet< |
base::android::MethodID::TYPE_INSTANCE>( |
- env, g_InputStream_clazz, |
+ env, InputStream_clazz(env), |
"markSupported", |
"()Z", |
&g_InputStream_markSupported); |
@@ -120,11 +128,11 @@ static jint Java_InputStream_readI(JNIEnv* env, jobject obj) __attribute__ |
static jint Java_InputStream_readI(JNIEnv* env, jobject obj) { |
/* Must call RegisterNativesImpl() */ |
CHECK_CLAZZ(env, obj, |
- g_InputStream_clazz, 0); |
+ InputStream_clazz(env), 0); |
jmethodID method_id = |
base::android::MethodID::LazyGet< |
base::android::MethodID::TYPE_INSTANCE>( |
- env, g_InputStream_clazz, |
+ env, InputStream_clazz(env), |
"read", |
"()I", |
&g_InputStream_readI); |
@@ -142,11 +150,11 @@ static jint Java_InputStream_readI_AB(JNIEnv* env, jobject obj, jbyteArray p0) |
static jint Java_InputStream_readI_AB(JNIEnv* env, jobject obj, jbyteArray p0) { |
/* Must call RegisterNativesImpl() */ |
CHECK_CLAZZ(env, obj, |
- g_InputStream_clazz, 0); |
+ InputStream_clazz(env), 0); |
jmethodID method_id = |
base::android::MethodID::LazyGet< |
base::android::MethodID::TYPE_INSTANCE>( |
- env, g_InputStream_clazz, |
+ env, InputStream_clazz(env), |
"read", |
"([B)I", |
&g_InputStream_readI_AB); |
@@ -169,11 +177,11 @@ static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray |
JniIntWrapper p2) { |
/* Must call RegisterNativesImpl() */ |
CHECK_CLAZZ(env, obj, |
- g_InputStream_clazz, 0); |
+ InputStream_clazz(env), 0); |
jmethodID method_id = |
base::android::MethodID::LazyGet< |
base::android::MethodID::TYPE_INSTANCE>( |
- env, g_InputStream_clazz, |
+ env, InputStream_clazz(env), |
"read", |
"([BII)I", |
&g_InputStream_readI_AB_I_I); |
@@ -191,11 +199,11 @@ static void Java_InputStream_reset(JNIEnv* env, jobject obj) __attribute__ |
static void Java_InputStream_reset(JNIEnv* env, jobject obj) { |
/* Must call RegisterNativesImpl() */ |
CHECK_CLAZZ(env, obj, |
- g_InputStream_clazz); |
+ InputStream_clazz(env)); |
jmethodID method_id = |
base::android::MethodID::LazyGet< |
base::android::MethodID::TYPE_INSTANCE>( |
- env, g_InputStream_clazz, |
+ env, InputStream_clazz(env), |
"reset", |
"()V", |
&g_InputStream_reset); |
@@ -212,11 +220,11 @@ static jlong Java_InputStream_skip(JNIEnv* env, jobject obj, jlong p0) |
static jlong Java_InputStream_skip(JNIEnv* env, jobject obj, jlong p0) { |
/* Must call RegisterNativesImpl() */ |
CHECK_CLAZZ(env, obj, |
- g_InputStream_clazz, 0); |
+ InputStream_clazz(env), 0); |
jmethodID method_id = |
base::android::MethodID::LazyGet< |
base::android::MethodID::TYPE_INSTANCE>( |
- env, g_InputStream_clazz, |
+ env, InputStream_clazz(env), |
"skip", |
"(J)J", |
&g_InputStream_skip); |
@@ -234,18 +242,18 @@ static base::android::ScopedJavaLocalRef<jobject> |
static base::android::ScopedJavaLocalRef<jobject> |
Java_InputStream_Constructor(JNIEnv* env) { |
/* Must call RegisterNativesImpl() */ |
- CHECK_CLAZZ(env, g_InputStream_clazz, |
- g_InputStream_clazz, NULL); |
+ CHECK_CLAZZ(env, InputStream_clazz(env), |
+ InputStream_clazz(env), NULL); |
jmethodID method_id = |
base::android::MethodID::LazyGet< |
base::android::MethodID::TYPE_INSTANCE>( |
- env, g_InputStream_clazz, |
+ env, InputStream_clazz(env), |
"<init>", |
"()V", |
&g_InputStream_Constructor); |
jobject ret = |
- env->NewObject(g_InputStream_clazz, |
+ env->NewObject(InputStream_clazz(env), |
method_id); |
jni_generator::CheckException(env); |
return base::android::ScopedJavaLocalRef<jobject>(env, ret); |