Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(349)

Unified Diff: trunk/src/base/android/jni_generator/testPureNativeMethodsOption.golden

Issue 492713002: Revert 290810 "Make class lookup lazy in jni_generator when usin..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/base/android/jni_generator/testPureNativeMethodsOption.golden
===================================================================
--- trunk/src/base/android/jni_generator/testPureNativeMethodsOption.golden (revision 290812)
+++ trunk/src/base/android/jni_generator/testPureNativeMethodsOption.golden (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
@@ -19,16 +19,8 @@
// Step 1: forward declarations.
namespace {
const char kTestClassPath[] = "org/chromium/example/jni_generator/Test";
-#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_Test_clazz = NULL;
-jclass Test_clazz(JNIEnv*) { return g_Test_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
} // namespace
@@ -58,11 +50,11 @@
const int kMethodsTestSize = arraysize(kMethodsTest);
- if (env->RegisterNatives(Test_clazz(env),
+ if (env->RegisterNatives(g_Test_clazz,
kMethodsTest,
kMethodsTestSize) < 0) {
jni_generator::HandleRegistrationError(
- env, Test_clazz(env), __FILE__);
+ env, g_Test_clazz, __FILE__);
return false;
}

Powered by Google App Engine
This is Rietveld 408576698