summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-20 11:44:05 +0000
committerygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-20 11:45:41 +0000
commit3b2dba9f6b113b03dc71ba5b9195a27fda2e945a (patch)
tree541909d9af801efe4438b18fd57ec22655828c23
parentaca4d3a65f0d9cf04d50eed22905652f5bb44b98 (diff)
downloadchromium_src-3b2dba9f6b113b03dc71ba5b9195a27fda2e945a.zip
chromium_src-3b2dba9f6b113b03dc71ba5b9195a27fda2e945a.tar.gz
chromium_src-3b2dba9f6b113b03dc71ba5b9195a27fda2e945a.tar.bz2
Revert 290810 "Make class lookup lazy in jni_generator when usin..."
> Make class lookup lazy in jni_generator when using lazy method lookup. > > This removes the eager class registration from RegisterNatives when possible. > > BUG=402003 > TBR=sievers@chromium.org, brettw@chromium.org > > Review URL: https://codereview.chromium.org/472553002 TBR=mkosiba@chromium.org Review URL: https://codereview.chromium.org/492713002 Cr-Commit-Position: refs/heads/master@{#290813} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--android_webview/lib/main/webview_entry_point.cc4
-rw-r--r--base/BUILD.gn3
-rw-r--r--base/android/base_jni_registrar.cc2
-rw-r--r--base/android/java/src/org/chromium/base/JNIUtils.java20
-rw-r--r--base/android/jni_android.cc57
-rw-r--r--base/android/jni_android.h20
-rw-r--r--base/android/jni_generator/golden_sample_for_tests_jni.h60
-rwxr-xr-xbase/android/jni_generator/jni_generator.py61
-rw-r--r--base/android/jni_generator/testCalledByNatives.golden91
-rw-r--r--base/android/jni_generator/testConstantsFromJavaP.golden394
-rw-r--r--base/android/jni_generator/testEagerCalledByNativesOption.golden29
-rw-r--r--base/android/jni_generator/testFromJavaP.golden54
-rw-r--r--base/android/jni_generator/testFromJavaPGenerics.golden14
-rw-r--r--base/android/jni_generator/testInnerClassNatives.golden14
-rw-r--r--base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden18
-rw-r--r--base/android/jni_generator/testInnerClassNativesMultiple.golden18
-rw-r--r--base/android/jni_generator/testJNIInitNativeNameOption.golden14
-rw-r--r--base/android/jni_generator/testJarJarRemapping.golden14
-rw-r--r--base/android/jni_generator/testMultipleJNIAdditionalImport.golden22
-rw-r--r--base/android/jni_generator/testNativeExportsOption.golden48
-rw-r--r--base/android/jni_generator/testNatives.golden14
-rw-r--r--base/android/jni_generator/testNativesLong.golden14
-rw-r--r--base/android/jni_generator/testPureNativeMethodsOption.golden14
-rw-r--r--base/android/jni_generator/testSingleJNIAdditionalImport.golden22
-rw-r--r--base/android/jni_utils.cc25
-rw-r--r--base/android/jni_utils.h27
-rw-r--r--base/base.gyp1
-rw-r--r--base/base.gypi2
-rw-r--r--ui/gl/android/scoped_java_surface.cc2
29 files changed, 371 insertions, 707 deletions
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc
index 73bf8f7..1aa1d27 100644
--- a/android_webview/lib/main/webview_entry_point.cc
+++ b/android_webview/lib/main/webview_entry_point.cc
@@ -6,7 +6,6 @@
#include "android_webview/native/android_webview_jni_registrar.h"
#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
-#include "base/android/jni_utils.h"
#include "base/android/library_loader/library_loader_hooks.h"
#include "components/navigation_interception/component_jni_registrar.h"
#include "components/web_contents_delegate_android/component_jni_registrar.h"
@@ -48,9 +47,6 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
if (!android_webview::RegisterJni(env))
return -1;
- base::android::InitReplacementClassLoader(env,
- base::android::GetClassLoader(env));
-
content::SetContentMainDelegate(new android_webview::AwMainDelegate());
// Initialize url lib here while we are still single-threaded, in case we use
diff --git a/base/BUILD.gn b/base/BUILD.gn
index e8a27b9..0f83b32 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -49,8 +49,6 @@ component("base") {
"android/jni_registrar.h",
"android/jni_string.cc",
"android/jni_string.h",
- "android/jni_utils.cc",
- "android/jni_utils.h",
"android/jni_weak_ref.cc",
"android/jni_weak_ref.h",
"android/library_loader/library_loader_hooks.cc",
@@ -1345,7 +1343,6 @@ if (is_android) {
"android/java/src/org/chromium/base/EventLog.java",
"android/java/src/org/chromium/base/FieldTrialList.java",
"android/java/src/org/chromium/base/ImportantFileWriterAndroid.java",
- "android/java/src/org/chromium/base/JNIUtils.java",
"android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
"android/java/src/org/chromium/base/MemoryPressureListener.java",
"android/java/src/org/chromium/base/JavaHandlerThread.java",
diff --git a/base/android/base_jni_registrar.cc b/base/android/base_jni_registrar.cc
index b6d8a28..a7a5fd2 100644
--- a/base/android/base_jni_registrar.cc
+++ b/base/android/base_jni_registrar.cc
@@ -15,7 +15,6 @@
#include "base/android/java_handler_thread.h"
#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
-#include "base/android/jni_utils.h"
#include "base/android/memory_pressure_listener_android.h"
#include "base/android/path_service_android.h"
#include "base/android/path_utils.h"
@@ -41,7 +40,6 @@ static RegistrationMethod kBaseRegisteredMethods[] = {
{ "FieldTrialList", base::android::RegisterFieldTrialList },
{ "ImportantFileWriterAndroid",
base::android::RegisterImportantFileWriterAndroid },
- { "JNIUtils", base::android::RegisterJNIUtils },
{ "MemoryPressureListenerAndroid",
base::android::MemoryPressureListenerAndroid::Register },
{ "JavaHandlerThread", base::android::JavaHandlerThread::RegisterBindings },
diff --git a/base/android/java/src/org/chromium/base/JNIUtils.java b/base/android/java/src/org/chromium/base/JNIUtils.java
deleted file mode 100644
index 6f6cd54..0000000
--- a/base/android/java/src/org/chromium/base/JNIUtils.java
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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.
-
-package org.chromium.base;
-
-/**
- * This class provides JNI-related methods to the native library.
- */
-public class JNIUtils {
- /**
- * This returns a ClassLoader that is capable of loading Chromium Java code. Such a ClassLoader
- * is needed for the few cases where the JNI mechanism is unable to automatically determine the
- * appropriate ClassLoader instance.
- */
- @CalledByNative
- public static Object getClassLoader() {
- return JNIUtils.class.getClassLoader();
- }
-}
diff --git a/base/android/jni_android.cc b/base/android/jni_android.cc
index e09c2d5..6f080fb 100644
--- a/base/android/jni_android.cc
+++ b/base/android/jni_android.cc
@@ -8,7 +8,6 @@
#include "base/android/build_info.h"
#include "base/android/jni_string.h"
-#include "base/android/jni_utils.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
@@ -22,9 +21,6 @@ JavaVM* g_jvm = NULL;
// that may still be running at shutdown. There is no harm in doing this.
base::LazyInstance<base::android::ScopedJavaGlobalRef<jobject> >::Leaky
g_application_context = LAZY_INSTANCE_INITIALIZER;
-base::LazyInstance<base::android::ScopedJavaGlobalRef<jobject> >::Leaky
- g_class_loader = LAZY_INSTANCE_INITIALIZER;
-jmethodID g_class_loader_load_class_method_id = 0;
std::string GetJavaExceptionInfo(JNIEnv* env, jthrowable java_throwable) {
ScopedJavaLocalRef<jclass> throwable_clazz =
@@ -122,68 +118,17 @@ void InitApplicationContext(JNIEnv* env, const JavaRef<jobject>& context) {
g_application_context.Get().Reset(context);
}
-void InitReplacementClassLoader(JNIEnv* env,
- const JavaRef<jobject>& class_loader) {
- DCHECK(g_class_loader.Get().is_null());
- DCHECK(!class_loader.is_null());
-
- ScopedJavaLocalRef<jclass> class_loader_clazz =
- GetClass(env, "java/lang/ClassLoader");
- CHECK(!ClearException(env));
- g_class_loader_load_class_method_id =
- env->GetMethodID(class_loader_clazz.obj(),
- "loadClass",
- "(Ljava/lang/String;)Ljava/lang/Class;");
- CHECK(!ClearException(env));
-
- DCHECK(env->IsInstanceOf(class_loader.obj(), class_loader_clazz.obj()));
- g_class_loader.Get().Reset(class_loader);
-}
-
const jobject GetApplicationContext() {
DCHECK(!g_application_context.Get().is_null());
return g_application_context.Get().obj();
}
ScopedJavaLocalRef<jclass> GetClass(JNIEnv* env, const char* class_name) {
- jclass clazz;
- if (!g_class_loader.Get().is_null()) {
- clazz = static_cast<jclass>(
- env->CallObjectMethod(g_class_loader.Get().obj(),
- g_class_loader_load_class_method_id,
- ConvertUTF8ToJavaString(env, class_name).obj()));
- } else {
- clazz = env->FindClass(class_name);
- }
+ jclass clazz = env->FindClass(class_name);
CHECK(!ClearException(env) && clazz) << "Failed to find class " << class_name;
return ScopedJavaLocalRef<jclass>(env, clazz);
}
-jclass LazyGetClass(
- JNIEnv* env,
- const char* class_name,
- base::subtle::AtomicWord* atomic_class_id) {
- COMPILE_ASSERT(sizeof(subtle::AtomicWord) >= sizeof(jclass),
- AtomicWord_SmallerThan_jMethodID);
- subtle::AtomicWord value = base::subtle::Acquire_Load(atomic_class_id);
- if (value)
- return reinterpret_cast<jclass>(value);
- ScopedJavaGlobalRef<jclass> clazz;
- clazz.Reset(GetClass(env, class_name));
- subtle::AtomicWord null_aw = reinterpret_cast<subtle::AtomicWord>(NULL);
- subtle::AtomicWord cas_result = base::subtle::Release_CompareAndSwap(
- atomic_class_id,
- null_aw,
- reinterpret_cast<subtle::AtomicWord>(clazz.obj()));
- if (cas_result == null_aw) {
- // We intentionally leak the global ref since we now storing it as a raw
- // pointer in |atomic_class_id|.
- return clazz.Release();
- } else {
- return reinterpret_cast<jclass>(cas_result);
- }
-}
-
template<MethodID::Type type>
jmethodID MethodID::Get(JNIEnv* env,
jclass clazz,
diff --git a/base/android/jni_android.h b/base/android/jni_android.h
index b5e5526..faf53b7 100644
--- a/base/android/jni_android.h
+++ b/base/android/jni_android.h
@@ -53,15 +53,6 @@ BASE_EXPORT bool IsVMInitialized();
BASE_EXPORT void InitApplicationContext(JNIEnv* env,
const JavaRef<jobject>& context);
-// Initializes the global ClassLoader used by the GetClass and LazyGetClass
-// methods. This is needed because JNI will use the base ClassLoader when there
-// is no Java code on the stack. The base ClassLoader doesn't know about any of
-// the application classes and will fail to lookup anything other than system
-// classes.
-BASE_EXPORT void InitReplacementClassLoader(
- JNIEnv* env,
- const JavaRef<jobject>& class_loader);
-
// Gets a global ref to the application context set with
// InitApplicationContext(). Ownership is retained by the function - the caller
// must NOT release it.
@@ -75,17 +66,6 @@ const BASE_EXPORT jobject GetApplicationContext();
BASE_EXPORT ScopedJavaLocalRef<jclass> GetClass(JNIEnv* env,
const char* class_name);
-// The method will initialize |atomic_class_id| to contain a global ref to the
-// class. And will return that ref on subsequent calls. It's the caller's
-// responsibility to release the ref when it is no longer needed.
-// The caller is responsible to zero-initialize |atomic_method_id|.
-// It's fine to simultaneously call this on multiple threads referencing the
-// same |atomic_method_id|.
-BASE_EXPORT jclass LazyGetClass(
- JNIEnv* env,
- const char* class_name,
- base::subtle::AtomicWord* atomic_class_id);
-
// This class is a wrapper for JNIEnv Get(Static)MethodID.
class BASE_EXPORT MethodID {
public:
diff --git a/base/android/jni_generator/golden_sample_for_tests_jni.h b/base/android/jni_generator/golden_sample_for_tests_jni.h
index 9398752..7dbf71e 100644
--- a/base/android/jni_generator/golden_sample_for_tests_jni.h
+++ b/base/android/jni_generator/golden_sample_for_tests_jni.h
@@ -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.
@@ -24,22 +24,12 @@ 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
@@ -109,11 +99,11 @@ static jint Java_SampleForTests_javaMethod(JNIEnv* env, jobject obj,
JniIntWrapper bar) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- SampleForTests_clazz(env), 0);
+ g_SampleForTests_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, SampleForTests_clazz(env),
+ env, g_SampleForTests_clazz,
"javaMethod",
"("
@@ -133,12 +123,12 @@ static jint Java_SampleForTests_javaMethod(JNIEnv* env, jobject obj,
static base::subtle::AtomicWord g_SampleForTests_staticJavaMethod = 0;
static jboolean Java_SampleForTests_staticJavaMethod(JNIEnv* env) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, SampleForTests_clazz(env),
- SampleForTests_clazz(env), false);
+ CHECK_CLAZZ(env, g_SampleForTests_clazz,
+ g_SampleForTests_clazz, false);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, SampleForTests_clazz(env),
+ env, g_SampleForTests_clazz,
"staticJavaMethod",
"("
@@ -147,7 +137,7 @@ static jboolean Java_SampleForTests_staticJavaMethod(JNIEnv* env) {
&g_SampleForTests_staticJavaMethod);
jboolean ret =
- env->CallStaticBooleanMethod(SampleForTests_clazz(env),
+ env->CallStaticBooleanMethod(g_SampleForTests_clazz,
method_id);
jni_generator::CheckException(env);
return ret;
@@ -158,11 +148,11 @@ static void Java_SampleForTests_packagePrivateJavaMethod(JNIEnv* env, jobject
obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- SampleForTests_clazz(env));
+ g_SampleForTests_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, SampleForTests_clazz(env),
+ env, g_SampleForTests_clazz,
"packagePrivateJavaMethod",
"("
@@ -181,11 +171,11 @@ static void Java_SampleForTests_methodThatThrowsException(JNIEnv* env, jobject
obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- SampleForTests_clazz(env));
+ g_SampleForTests_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, SampleForTests_clazz(env),
+ env, g_SampleForTests_clazz,
"methodThatThrowsException",
"("
@@ -204,12 +194,12 @@ static base::android::ScopedJavaLocalRef<jobject>
JniIntWrapper i,
jstring s) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, InnerStructA_clazz(env),
- InnerStructA_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_InnerStructA_clazz,
+ g_InnerStructA_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, InnerStructA_clazz(env),
+ env, g_InnerStructA_clazz,
"create",
"("
@@ -221,7 +211,7 @@ static base::android::ScopedJavaLocalRef<jobject>
&g_InnerStructA_create);
jobject ret =
- env->CallStaticObjectMethod(InnerStructA_clazz(env),
+ env->CallStaticObjectMethod(g_InnerStructA_clazz,
method_id, l, as_jint(i), s);
jni_generator::CheckException(env);
return base::android::ScopedJavaLocalRef<jobject>(env, ret);
@@ -232,11 +222,11 @@ static void Java_SampleForTests_addStructA(JNIEnv* env, jobject obj, jobject a)
{
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- SampleForTests_clazz(env));
+ g_SampleForTests_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, SampleForTests_clazz(env),
+ env, g_SampleForTests_clazz,
"addStructA",
"("
@@ -256,11 +246,11 @@ static void Java_SampleForTests_iterateAndDoSomething(JNIEnv* env, jobject obj)
{
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- SampleForTests_clazz(env));
+ g_SampleForTests_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, SampleForTests_clazz(env),
+ env, g_SampleForTests_clazz,
"iterateAndDoSomething",
"("
@@ -278,11 +268,11 @@ static base::subtle::AtomicWord g_InnerStructB_getKey = 0;
static jlong Java_InnerStructB_getKey(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- InnerStructB_clazz(env), 0);
+ g_InnerStructB_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InnerStructB_clazz(env),
+ env, g_InnerStructB_clazz,
"getKey",
"("
@@ -302,11 +292,11 @@ static base::android::ScopedJavaLocalRef<jstring>
Java_InnerStructB_getValue(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- InnerStructB_clazz(env), NULL);
+ g_InnerStructB_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InnerStructB_clazz(env),
+ env, g_InnerStructB_clazz,
"getValue",
"("
@@ -389,11 +379,11 @@ static bool RegisterNativesImpl(JNIEnv* env) {
const int kMethodsSampleForTestsSize = arraysize(kMethodsSampleForTests);
- if (env->RegisterNatives(SampleForTests_clazz(env),
+ if (env->RegisterNatives(g_SampleForTests_clazz,
kMethodsSampleForTests,
kMethodsSampleForTestsSize) < 0) {
jni_generator::HandleRegistrationError(
- env, SampleForTests_clazz(env), __FILE__);
+ env, g_SampleForTests_clazz, __FILE__);
return false;
}
diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py
index a1d8790..88332fa 100755
--- a/base/android/jni_generator/jni_generator.py
+++ b/base/android/jni_generator/jni_generator.py
@@ -731,7 +731,7 @@ class InlHeaderFileGenerator(object):
def GetContent(self):
"""Returns the content of the JNI binding file."""
template = Template("""\
-// 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.
@@ -947,11 +947,11 @@ ${CALLED_BY_NATIVES}
template = Template("""\
const int kMethods${JAVA_CLASS}Size = arraysize(kMethods${JAVA_CLASS});
- if (env->RegisterNatives(${JAVA_CLASS}_clazz(env),
+ if (env->RegisterNatives(g_${JAVA_CLASS}_clazz,
kMethods${JAVA_CLASS},
kMethods${JAVA_CLASS}Size) < 0) {
jni_generator::HandleRegistrationError(
- env, ${JAVA_CLASS}_clazz(env), __FILE__);
+ env, g_${JAVA_CLASS}_clazz, __FILE__);
return false;
}
""")
@@ -1122,10 +1122,11 @@ static ${RETURN} ${NAME}(JNIEnv* env, ${PARAMS_IN_DECLARATION}) {"""
def GetCalledByNativeValues(self, called_by_native):
"""Fills in necessary values for the CalledByNative methods."""
- java_class = called_by_native.java_class_name or self.class_name
if called_by_native.static or called_by_native.is_constructor:
first_param_in_declaration = ''
- first_param_in_call = ('%s_clazz(env)' % java_class)
+ first_param_in_call = ('g_%s_clazz' %
+ (called_by_native.java_class_name or
+ self.class_name))
else:
first_param_in_declaration = ', jobject obj'
first_param_in_call = 'obj'
@@ -1159,7 +1160,7 @@ static ${RETURN} ${NAME}(JNIEnv* env, ${PARAMS_IN_DECLARATION}) {"""
else:
return_clause = 'return ret;'
return {
- 'JAVA_CLASS': java_class,
+ 'JAVA_CLASS': called_by_native.java_class_name or self.class_name,
'RETURN_TYPE': return_type,
'OPTIONAL_ERROR_RETURN': optional_error_return,
'RETURN_DECLARATION': return_declaration,
@@ -1203,7 +1204,7 @@ static base::subtle::AtomicWord g_${JAVA_CLASS}_${METHOD_ID_VAR_NAME} = 0;
${FUNCTION_HEADER}
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, ${FIRST_PARAM_IN_CALL},
- ${JAVA_CLASS}_clazz(env)${OPTIONAL_ERROR_RETURN});
+ g_${JAVA_CLASS}_clazz${OPTIONAL_ERROR_RETURN});
jmethodID method_id =
${GET_METHOD_ID_IMPL}
${RETURN_DECLARATION}
@@ -1262,56 +1263,22 @@ const char k${JAVA_CLASS}ClassPath[] = "${JNI_CLASS_PATH}";""")
}
ret += [template.substitute(values)]
ret += ''
-
- class_getter_methods = []
- if self.options.native_exports:
- template = Template("""\
-// Leaking this jclass as we cannot use LazyInstance from some threads.
-base::subtle::AtomicWord g_${JAVA_CLASS}_clazz = 0;
-jclass ${JAVA_CLASS}_clazz(JNIEnv* env) {
- return base::android::LazyGetClass(env, k${JAVA_CLASS}ClassPath, \
- &g_${JAVA_CLASS}_clazz);
-}""")
- else:
+ for clazz in called_by_native_classes:
template = Template("""\
// Leaking this jclass as we cannot use LazyInstance from some threads.
-jclass g_${JAVA_CLASS}_clazz = NULL;
-jclass ${JAVA_CLASS}_clazz(JNIEnv*) { return g_${JAVA_CLASS}_clazz; }""")
-
- for clazz in called_by_native_classes:
+jclass g_${JAVA_CLASS}_clazz = NULL;""")
values = {
'JAVA_CLASS': clazz,
}
- class_getter_methods += [template.substitute(values)]
-
- template = Template("""\
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
-#endif
-${CLASS_GETER_METHODS}
-#if __clang__
-#pragma clang diagnostic pop
-#endif""")
- values = {
- 'CLASS_GETER_METHODS': '\n'.join(class_getter_methods)
- }
- ret += [template.substitute(values)]
+ ret += [template.substitute(values)]
return '\n'.join(ret)
def GetFindClasses(self):
"""Returns the imlementation of FindClass for all known classes."""
if self.init_native:
- if self.options.native_exports:
- template = Template("""\
- base::subtle::Release_Store(&g_${JAVA_CLASS}_clazz,
- static_cast<base::subtle::AtomicWord>(env->NewWeakGlobalRef(clazz));""")
- else:
- template = Template("""\
+ template = Template("""\
g_${JAVA_CLASS}_clazz = static_cast<jclass>(env->NewWeakGlobalRef(clazz));""")
else:
- if self.options.native_exports:
- return '\n'
template = Template("""\
g_${JAVA_CLASS}_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
base::android::GetClass(env, k${JAVA_CLASS}ClassPath).obj()));""")
@@ -1326,13 +1293,13 @@ ${CLASS_GETER_METHODS}
if self.options.eager_called_by_natives:
template = Template("""\
env->Get${STATIC_METHOD_PART}MethodID(
- ${JAVA_CLASS}_clazz(env),
+ g_${JAVA_CLASS}_clazz,
"${JNI_NAME}", ${JNI_SIGNATURE});""")
else:
template = Template("""\
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_${STATIC}>(
- env, ${JAVA_CLASS}_clazz(env),
+ env, g_${JAVA_CLASS}_clazz,
"${JNI_NAME}",
${JNI_SIGNATURE},
&g_${JAVA_CLASS}_${METHOD_ID_VAR_NAME});
diff --git a/base/android/jni_generator/testCalledByNatives.golden b/base/android/jni_generator/testCalledByNatives.golden
index 57a48ca..abdc507 100644
--- a/base/android/jni_generator/testCalledByNatives.golden
+++ b/base/android/jni_generator/testCalledByNatives.golden
@@ -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.
@@ -20,19 +20,10 @@
namespace {
const char kTestJniClassPath[] = "org/chromium/TestJni";
const char kInfoBarClassPath[] = "org/chromium/TestJni$InfoBar";
-#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_TestJni_clazz = NULL;
-jclass TestJni_clazz(JNIEnv*) { return g_TestJni_clazz; }
// Leaking this jclass as we cannot use LazyInstance from some threads.
jclass g_InfoBar_clazz = NULL;
-jclass InfoBar_clazz(JNIEnv*) { return g_InfoBar_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
} // namespace
@@ -48,11 +39,11 @@ static base::android::ScopedJavaLocalRef<jobject>
jobject icon) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"showConfirmInfoBar",
"("
@@ -82,11 +73,11 @@ static base::android::ScopedJavaLocalRef<jobject>
jstring args) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"showAutoLoginInfoBar",
"("
@@ -109,11 +100,11 @@ static base::subtle::AtomicWord g_InfoBar_dismiss = 0;
static void Java_InfoBar_dismiss(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- InfoBar_clazz(env));
+ g_InfoBar_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InfoBar_clazz(env),
+ env, g_InfoBar_clazz,
"dismiss",
"("
@@ -133,12 +124,12 @@ static jboolean Java_TestJni_shouldShowAutoLogin(JNIEnv* env, jobject view,
jstring account,
jstring args) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, TestJni_clazz(env),
- TestJni_clazz(env), false);
+ CHECK_CLAZZ(env, g_TestJni_clazz,
+ g_TestJni_clazz, false);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"shouldShowAutoLogin",
"("
@@ -151,7 +142,7 @@ static jboolean Java_TestJni_shouldShowAutoLogin(JNIEnv* env, jobject view,
&g_TestJni_shouldShowAutoLogin);
jboolean ret =
- env->CallStaticBooleanMethod(TestJni_clazz(env),
+ env->CallStaticBooleanMethod(g_TestJni_clazz,
method_id, view, realm, account, args);
jni_generator::CheckException(env);
return ret;
@@ -161,12 +152,12 @@ static base::subtle::AtomicWord g_TestJni_openUrl = 0;
static base::android::ScopedJavaLocalRef<jobject> Java_TestJni_openUrl(JNIEnv*
env, jstring url) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, TestJni_clazz(env),
- TestJni_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_TestJni_clazz,
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"openUrl",
"("
@@ -176,7 +167,7 @@ static base::android::ScopedJavaLocalRef<jobject> Java_TestJni_openUrl(JNIEnv*
&g_TestJni_openUrl);
jobject ret =
- env->CallStaticObjectMethod(TestJni_clazz(env),
+ env->CallStaticObjectMethod(g_TestJni_clazz,
method_id, url);
jni_generator::CheckException(env);
return base::android::ScopedJavaLocalRef<jobject>(env, ret);
@@ -191,11 +182,11 @@ static void Java_TestJni_activateHardwareAcceleration(JNIEnv* env, jobject obj,
JniIntWrapper iSecondaryID) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env));
+ g_TestJni_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"activateHardwareAcceleration",
"("
@@ -220,11 +211,11 @@ static void Java_TestJni_uncheckedCall(JNIEnv* env, jobject obj, JniIntWrapper
iParam) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env));
+ g_TestJni_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"uncheckedCall",
"("
@@ -243,11 +234,11 @@ static base::android::ScopedJavaLocalRef<jbyteArray>
Java_TestJni_returnByteArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnByteArray",
"("
@@ -267,11 +258,11 @@ static base::android::ScopedJavaLocalRef<jbooleanArray>
Java_TestJni_returnBooleanArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnBooleanArray",
"("
@@ -291,11 +282,11 @@ static base::android::ScopedJavaLocalRef<jcharArray>
Java_TestJni_returnCharArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnCharArray",
"("
@@ -315,11 +306,11 @@ static base::android::ScopedJavaLocalRef<jshortArray>
Java_TestJni_returnShortArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnShortArray",
"("
@@ -339,11 +330,11 @@ static base::android::ScopedJavaLocalRef<jintArray>
Java_TestJni_returnIntArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnIntArray",
"("
@@ -363,11 +354,11 @@ static base::android::ScopedJavaLocalRef<jlongArray>
Java_TestJni_returnLongArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnLongArray",
"("
@@ -387,11 +378,11 @@ static base::android::ScopedJavaLocalRef<jdoubleArray>
Java_TestJni_returnDoubleArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnDoubleArray",
"("
@@ -411,11 +402,11 @@ static base::android::ScopedJavaLocalRef<jobjectArray>
Java_TestJni_returnObjectArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnObjectArray",
"("
@@ -435,11 +426,11 @@ static base::android::ScopedJavaLocalRef<jobjectArray>
Java_TestJni_returnArrayOfByteArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnArrayOfByteArray",
"("
@@ -459,11 +450,11 @@ static base::android::ScopedJavaLocalRef<jobject>
Java_TestJni_getCompressFormat(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"getCompressFormat",
"("
@@ -483,11 +474,11 @@ static base::android::ScopedJavaLocalRef<jobject>
Java_TestJni_getCompressFormatList(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"getCompressFormatList",
"("
diff --git a/base/android/jni_generator/testConstantsFromJavaP.golden b/base/android/jni_generator/testConstantsFromJavaP.golden
index 89955d6..795bd54 100644
--- a/base/android/jni_generator/testConstantsFromJavaP.golden
+++ b/base/android/jni_generator/testConstantsFromJavaP.golden
@@ -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 kMotionEventClassPath[] = "android/view/MotionEvent";
-#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_MotionEvent_clazz = NULL;
-jclass MotionEvent_clazz(JNIEnv*) { return g_MotionEvent_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
} // namespace
@@ -125,11 +117,11 @@ static void Java_MotionEvent_finalize(JNIEnv* env, jobject obj) __attribute__
static void Java_MotionEvent_finalize(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"finalize",
"()V",
&g_MotionEvent_finalize);
@@ -175,18 +167,18 @@ static base::android::ScopedJavaLocalRef<jobject>
JniIntWrapper p12,
JniIntWrapper p13) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, MotionEvent_clazz(env),
- MotionEvent_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_MotionEvent_clazz,
+ g_MotionEvent_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"obtain",
"(JJII[Landroid/view/MotionEvent$PointerProperties;[Landroid/view/MotionEvent$PointerCoords;IIFFIIII)Landroid/view/MotionEvent;",
&g_MotionEvent_obtainAVME_J_J_I_I_LAVMEPP_LAVMEPC_I_I_F_F_I_I_I_I);
jobject ret =
- env->CallStaticObjectMethod(MotionEvent_clazz(env),
+ env->CallStaticObjectMethod(g_MotionEvent_clazz,
method_id, p0, p1, as_jint(p2), as_jint(p3), p4, p5, as_jint(p6),
as_jint(p7), p8, p9, as_jint(p10), as_jint(p11), as_jint(p12),
as_jint(p13));
@@ -227,18 +219,18 @@ static base::android::ScopedJavaLocalRef<jobject>
JniIntWrapper p11,
JniIntWrapper p12) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, MotionEvent_clazz(env),
- MotionEvent_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_MotionEvent_clazz,
+ g_MotionEvent_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"obtain",
"(JJII[I[Landroid/view/MotionEvent$PointerCoords;IFFIIII)Landroid/view/MotionEvent;",
&g_MotionEvent_obtainAVME_J_J_I_I_AI_LAVMEPC_I_F_F_I_I_I_I);
jobject ret =
- env->CallStaticObjectMethod(MotionEvent_clazz(env),
+ env->CallStaticObjectMethod(g_MotionEvent_clazz,
method_id, p0, p1, as_jint(p2), as_jint(p3), p4, p5, as_jint(p6), p7,
p8, as_jint(p9), as_jint(p10), as_jint(p11), as_jint(p12));
jni_generator::CheckException(env);
@@ -274,18 +266,18 @@ static base::android::ScopedJavaLocalRef<jobject>
JniIntWrapper p10,
JniIntWrapper p11) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, MotionEvent_clazz(env),
- MotionEvent_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_MotionEvent_clazz,
+ g_MotionEvent_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"obtain",
"(JJIFFFFIFFII)Landroid/view/MotionEvent;",
&g_MotionEvent_obtainAVME_J_J_I_F_F_F_F_I_F_F_I_I);
jobject ret =
- env->CallStaticObjectMethod(MotionEvent_clazz(env),
+ env->CallStaticObjectMethod(g_MotionEvent_clazz,
method_id, p0, p1, as_jint(p2), p3, p4, p5, p6, as_jint(p7), p8, p9,
as_jint(p10), as_jint(p11));
jni_generator::CheckException(env);
@@ -323,18 +315,18 @@ static base::android::ScopedJavaLocalRef<jobject>
JniIntWrapper p11,
JniIntWrapper p12) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, MotionEvent_clazz(env),
- MotionEvent_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_MotionEvent_clazz,
+ g_MotionEvent_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"obtain",
"(JJIIFFFFIFFII)Landroid/view/MotionEvent;",
&g_MotionEvent_obtainAVME_J_J_I_I_F_F_F_F_I_F_F_I_I);
jobject ret =
- env->CallStaticObjectMethod(MotionEvent_clazz(env),
+ env->CallStaticObjectMethod(g_MotionEvent_clazz,
method_id, p0, p1, as_jint(p2), as_jint(p3), p4, p5, p6, p7,
as_jint(p8), p9, p10, as_jint(p11), as_jint(p12));
jni_generator::CheckException(env);
@@ -357,18 +349,18 @@ static base::android::ScopedJavaLocalRef<jobject>
jfloat p4,
JniIntWrapper p5) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, MotionEvent_clazz(env),
- MotionEvent_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_MotionEvent_clazz,
+ g_MotionEvent_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"obtain",
"(JJIFFI)Landroid/view/MotionEvent;",
&g_MotionEvent_obtainAVME_J_J_I_F_F_I);
jobject ret =
- env->CallStaticObjectMethod(MotionEvent_clazz(env),
+ env->CallStaticObjectMethod(g_MotionEvent_clazz,
method_id, p0, p1, as_jint(p2), p3, p4, as_jint(p5));
jni_generator::CheckException(env);
return base::android::ScopedJavaLocalRef<jobject>(env, ret);
@@ -381,18 +373,18 @@ static base::android::ScopedJavaLocalRef<jobject>
static base::android::ScopedJavaLocalRef<jobject>
Java_MotionEvent_obtainAVME_AVME(JNIEnv* env, jobject p0) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, MotionEvent_clazz(env),
- MotionEvent_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_MotionEvent_clazz,
+ g_MotionEvent_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"obtain",
"(Landroid/view/MotionEvent;)Landroid/view/MotionEvent;",
&g_MotionEvent_obtainAVME_AVME);
jobject ret =
- env->CallStaticObjectMethod(MotionEvent_clazz(env),
+ env->CallStaticObjectMethod(g_MotionEvent_clazz,
method_id, p0);
jni_generator::CheckException(env);
return base::android::ScopedJavaLocalRef<jobject>(env, ret);
@@ -405,18 +397,18 @@ static base::android::ScopedJavaLocalRef<jobject>
static base::android::ScopedJavaLocalRef<jobject>
Java_MotionEvent_obtainNoHistory(JNIEnv* env, jobject p0) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, MotionEvent_clazz(env),
- MotionEvent_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_MotionEvent_clazz,
+ g_MotionEvent_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"obtainNoHistory",
"(Landroid/view/MotionEvent;)Landroid/view/MotionEvent;",
&g_MotionEvent_obtainNoHistory);
jobject ret =
- env->CallStaticObjectMethod(MotionEvent_clazz(env),
+ env->CallStaticObjectMethod(g_MotionEvent_clazz,
method_id, p0);
jni_generator::CheckException(env);
return base::android::ScopedJavaLocalRef<jobject>(env, ret);
@@ -428,11 +420,11 @@ static void Java_MotionEvent_recycle(JNIEnv* env, jobject obj) __attribute__
static void Java_MotionEvent_recycle(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"recycle",
"()V",
&g_MotionEvent_recycle);
@@ -449,11 +441,11 @@ static jint Java_MotionEvent_getDeviceId(JNIEnv* env, jobject obj) __attribute__
static jint Java_MotionEvent_getDeviceId(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getDeviceId",
"()I",
&g_MotionEvent_getDeviceId);
@@ -471,11 +463,11 @@ static jint Java_MotionEvent_getSource(JNIEnv* env, jobject obj) __attribute__
static jint Java_MotionEvent_getSource(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getSource",
"()I",
&g_MotionEvent_getSource);
@@ -494,11 +486,11 @@ static void Java_MotionEvent_setSource(JNIEnv* env, jobject obj, JniIntWrapper
p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"setSource",
"(I)V",
&g_MotionEvent_setSource);
@@ -515,11 +507,11 @@ static jint Java_MotionEvent_getAction(JNIEnv* env, jobject obj) __attribute__
static jint Java_MotionEvent_getAction(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getAction",
"()I",
&g_MotionEvent_getAction);
@@ -537,11 +529,11 @@ static jint Java_MotionEvent_getActionMasked(JNIEnv* env, jobject obj)
static jint Java_MotionEvent_getActionMasked(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getActionMasked",
"()I",
&g_MotionEvent_getActionMasked);
@@ -559,11 +551,11 @@ static jint Java_MotionEvent_getActionIndex(JNIEnv* env, jobject obj)
static jint Java_MotionEvent_getActionIndex(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getActionIndex",
"()I",
&g_MotionEvent_getActionIndex);
@@ -581,11 +573,11 @@ static jint Java_MotionEvent_getFlags(JNIEnv* env, jobject obj) __attribute__
static jint Java_MotionEvent_getFlags(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getFlags",
"()I",
&g_MotionEvent_getFlags);
@@ -603,11 +595,11 @@ static jlong Java_MotionEvent_getDownTime(JNIEnv* env, jobject obj)
static jlong Java_MotionEvent_getDownTime(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getDownTime",
"()J",
&g_MotionEvent_getDownTime);
@@ -625,11 +617,11 @@ static jlong Java_MotionEvent_getEventTime(JNIEnv* env, jobject obj)
static jlong Java_MotionEvent_getEventTime(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getEventTime",
"()J",
&g_MotionEvent_getEventTime);
@@ -647,11 +639,11 @@ static jfloat Java_MotionEvent_getXF(JNIEnv* env, jobject obj) __attribute__
static jfloat Java_MotionEvent_getXF(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getX",
"()F",
&g_MotionEvent_getXF);
@@ -669,11 +661,11 @@ static jfloat Java_MotionEvent_getYF(JNIEnv* env, jobject obj) __attribute__
static jfloat Java_MotionEvent_getYF(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getY",
"()F",
&g_MotionEvent_getYF);
@@ -691,11 +683,11 @@ static jfloat Java_MotionEvent_getPressureF(JNIEnv* env, jobject obj)
static jfloat Java_MotionEvent_getPressureF(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getPressure",
"()F",
&g_MotionEvent_getPressureF);
@@ -713,11 +705,11 @@ static jfloat Java_MotionEvent_getSizeF(JNIEnv* env, jobject obj) __attribute__
static jfloat Java_MotionEvent_getSizeF(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getSize",
"()F",
&g_MotionEvent_getSizeF);
@@ -735,11 +727,11 @@ static jfloat Java_MotionEvent_getTouchMajorF(JNIEnv* env, jobject obj)
static jfloat Java_MotionEvent_getTouchMajorF(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getTouchMajor",
"()F",
&g_MotionEvent_getTouchMajorF);
@@ -757,11 +749,11 @@ static jfloat Java_MotionEvent_getTouchMinorF(JNIEnv* env, jobject obj)
static jfloat Java_MotionEvent_getTouchMinorF(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getTouchMinor",
"()F",
&g_MotionEvent_getTouchMinorF);
@@ -779,11 +771,11 @@ static jfloat Java_MotionEvent_getToolMajorF(JNIEnv* env, jobject obj)
static jfloat Java_MotionEvent_getToolMajorF(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getToolMajor",
"()F",
&g_MotionEvent_getToolMajorF);
@@ -801,11 +793,11 @@ static jfloat Java_MotionEvent_getToolMinorF(JNIEnv* env, jobject obj)
static jfloat Java_MotionEvent_getToolMinorF(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getToolMinor",
"()F",
&g_MotionEvent_getToolMinorF);
@@ -823,11 +815,11 @@ static jfloat Java_MotionEvent_getOrientationF(JNIEnv* env, jobject obj)
static jfloat Java_MotionEvent_getOrientationF(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getOrientation",
"()F",
&g_MotionEvent_getOrientationF);
@@ -846,11 +838,11 @@ static jfloat Java_MotionEvent_getAxisValueF_I(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getAxisValue",
"(I)F",
&g_MotionEvent_getAxisValueF_I);
@@ -868,11 +860,11 @@ static jint Java_MotionEvent_getPointerCount(JNIEnv* env, jobject obj)
static jint Java_MotionEvent_getPointerCount(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getPointerCount",
"()I",
&g_MotionEvent_getPointerCount);
@@ -891,11 +883,11 @@ static jint Java_MotionEvent_getPointerId(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getPointerId",
"(I)I",
&g_MotionEvent_getPointerId);
@@ -914,11 +906,11 @@ static jint Java_MotionEvent_getToolType(JNIEnv* env, jobject obj, JniIntWrapper
p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getToolType",
"(I)I",
&g_MotionEvent_getToolType);
@@ -937,11 +929,11 @@ static jint Java_MotionEvent_findPointerIndex(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"findPointerIndex",
"(I)I",
&g_MotionEvent_findPointerIndex);
@@ -960,11 +952,11 @@ static jfloat Java_MotionEvent_getXF_I(JNIEnv* env, jobject obj, JniIntWrapper
p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getX",
"(I)F",
&g_MotionEvent_getXF_I);
@@ -983,11 +975,11 @@ static jfloat Java_MotionEvent_getYF_I(JNIEnv* env, jobject obj, JniIntWrapper
p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getY",
"(I)F",
&g_MotionEvent_getYF_I);
@@ -1006,11 +998,11 @@ static jfloat Java_MotionEvent_getPressureF_I(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getPressure",
"(I)F",
&g_MotionEvent_getPressureF_I);
@@ -1029,11 +1021,11 @@ static jfloat Java_MotionEvent_getSizeF_I(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getSize",
"(I)F",
&g_MotionEvent_getSizeF_I);
@@ -1052,11 +1044,11 @@ static jfloat Java_MotionEvent_getTouchMajorF_I(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getTouchMajor",
"(I)F",
&g_MotionEvent_getTouchMajorF_I);
@@ -1075,11 +1067,11 @@ static jfloat Java_MotionEvent_getTouchMinorF_I(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getTouchMinor",
"(I)F",
&g_MotionEvent_getTouchMinorF_I);
@@ -1098,11 +1090,11 @@ static jfloat Java_MotionEvent_getToolMajorF_I(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getToolMajor",
"(I)F",
&g_MotionEvent_getToolMajorF_I);
@@ -1121,11 +1113,11 @@ static jfloat Java_MotionEvent_getToolMinorF_I(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getToolMinor",
"(I)F",
&g_MotionEvent_getToolMinorF_I);
@@ -1144,11 +1136,11 @@ static jfloat Java_MotionEvent_getOrientationF_I(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getOrientation",
"(I)F",
&g_MotionEvent_getOrientationF_I);
@@ -1169,11 +1161,11 @@ static jfloat Java_MotionEvent_getAxisValueF_I_I(JNIEnv* env, jobject obj,
JniIntWrapper p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getAxisValue",
"(II)F",
&g_MotionEvent_getAxisValueF_I_I);
@@ -1194,11 +1186,11 @@ static void Java_MotionEvent_getPointerCoords(JNIEnv* env, jobject obj,
jobject p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getPointerCoords",
"(ILandroid/view/MotionEvent$PointerCoords;)V",
&g_MotionEvent_getPointerCoords);
@@ -1218,11 +1210,11 @@ static void Java_MotionEvent_getPointerProperties(JNIEnv* env, jobject obj,
jobject p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getPointerProperties",
"(ILandroid/view/MotionEvent$PointerProperties;)V",
&g_MotionEvent_getPointerProperties);
@@ -1239,11 +1231,11 @@ static jint Java_MotionEvent_getMetaState(JNIEnv* env, jobject obj)
static jint Java_MotionEvent_getMetaState(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getMetaState",
"()I",
&g_MotionEvent_getMetaState);
@@ -1261,11 +1253,11 @@ static jint Java_MotionEvent_getButtonState(JNIEnv* env, jobject obj)
static jint Java_MotionEvent_getButtonState(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getButtonState",
"()I",
&g_MotionEvent_getButtonState);
@@ -1283,11 +1275,11 @@ static jfloat Java_MotionEvent_getRawX(JNIEnv* env, jobject obj) __attribute__
static jfloat Java_MotionEvent_getRawX(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getRawX",
"()F",
&g_MotionEvent_getRawX);
@@ -1305,11 +1297,11 @@ static jfloat Java_MotionEvent_getRawY(JNIEnv* env, jobject obj) __attribute__
static jfloat Java_MotionEvent_getRawY(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getRawY",
"()F",
&g_MotionEvent_getRawY);
@@ -1327,11 +1319,11 @@ static jfloat Java_MotionEvent_getXPrecision(JNIEnv* env, jobject obj)
static jfloat Java_MotionEvent_getXPrecision(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getXPrecision",
"()F",
&g_MotionEvent_getXPrecision);
@@ -1349,11 +1341,11 @@ static jfloat Java_MotionEvent_getYPrecision(JNIEnv* env, jobject obj)
static jfloat Java_MotionEvent_getYPrecision(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getYPrecision",
"()F",
&g_MotionEvent_getYPrecision);
@@ -1371,11 +1363,11 @@ static jint Java_MotionEvent_getHistorySize(JNIEnv* env, jobject obj)
static jint Java_MotionEvent_getHistorySize(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistorySize",
"()I",
&g_MotionEvent_getHistorySize);
@@ -1394,11 +1386,11 @@ static jlong Java_MotionEvent_getHistoricalEventTime(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalEventTime",
"(I)J",
&g_MotionEvent_getHistoricalEventTime);
@@ -1417,11 +1409,11 @@ static jfloat Java_MotionEvent_getHistoricalXF_I(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalX",
"(I)F",
&g_MotionEvent_getHistoricalXF_I);
@@ -1440,11 +1432,11 @@ static jfloat Java_MotionEvent_getHistoricalYF_I(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalY",
"(I)F",
&g_MotionEvent_getHistoricalYF_I);
@@ -1463,11 +1455,11 @@ static jfloat Java_MotionEvent_getHistoricalPressureF_I(JNIEnv* env, jobject
obj, JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalPressure",
"(I)F",
&g_MotionEvent_getHistoricalPressureF_I);
@@ -1486,11 +1478,11 @@ static jfloat Java_MotionEvent_getHistoricalSizeF_I(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalSize",
"(I)F",
&g_MotionEvent_getHistoricalSizeF_I);
@@ -1509,11 +1501,11 @@ static jfloat Java_MotionEvent_getHistoricalTouchMajorF_I(JNIEnv* env, jobject
obj, JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalTouchMajor",
"(I)F",
&g_MotionEvent_getHistoricalTouchMajorF_I);
@@ -1532,11 +1524,11 @@ static jfloat Java_MotionEvent_getHistoricalTouchMinorF_I(JNIEnv* env, jobject
obj, JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalTouchMinor",
"(I)F",
&g_MotionEvent_getHistoricalTouchMinorF_I);
@@ -1555,11 +1547,11 @@ static jfloat Java_MotionEvent_getHistoricalToolMajorF_I(JNIEnv* env, jobject
obj, JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalToolMajor",
"(I)F",
&g_MotionEvent_getHistoricalToolMajorF_I);
@@ -1578,11 +1570,11 @@ static jfloat Java_MotionEvent_getHistoricalToolMinorF_I(JNIEnv* env, jobject
obj, JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalToolMinor",
"(I)F",
&g_MotionEvent_getHistoricalToolMinorF_I);
@@ -1601,11 +1593,11 @@ static jfloat Java_MotionEvent_getHistoricalOrientationF_I(JNIEnv* env, jobject
obj, JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalOrientation",
"(I)F",
&g_MotionEvent_getHistoricalOrientationF_I);
@@ -1626,11 +1618,11 @@ static jfloat Java_MotionEvent_getHistoricalAxisValueF_I_I(JNIEnv* env, jobject
JniIntWrapper p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalAxisValue",
"(II)F",
&g_MotionEvent_getHistoricalAxisValueF_I_I);
@@ -1651,11 +1643,11 @@ static jfloat Java_MotionEvent_getHistoricalXF_I_I(JNIEnv* env, jobject obj,
JniIntWrapper p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalX",
"(II)F",
&g_MotionEvent_getHistoricalXF_I_I);
@@ -1676,11 +1668,11 @@ static jfloat Java_MotionEvent_getHistoricalYF_I_I(JNIEnv* env, jobject obj,
JniIntWrapper p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalY",
"(II)F",
&g_MotionEvent_getHistoricalYF_I_I);
@@ -1701,11 +1693,11 @@ static jfloat Java_MotionEvent_getHistoricalPressureF_I_I(JNIEnv* env, jobject
JniIntWrapper p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalPressure",
"(II)F",
&g_MotionEvent_getHistoricalPressureF_I_I);
@@ -1726,11 +1718,11 @@ static jfloat Java_MotionEvent_getHistoricalSizeF_I_I(JNIEnv* env, jobject obj,
JniIntWrapper p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalSize",
"(II)F",
&g_MotionEvent_getHistoricalSizeF_I_I);
@@ -1751,11 +1743,11 @@ static jfloat Java_MotionEvent_getHistoricalTouchMajorF_I_I(JNIEnv* env, jobject
JniIntWrapper p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalTouchMajor",
"(II)F",
&g_MotionEvent_getHistoricalTouchMajorF_I_I);
@@ -1776,11 +1768,11 @@ static jfloat Java_MotionEvent_getHistoricalTouchMinorF_I_I(JNIEnv* env, jobject
JniIntWrapper p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalTouchMinor",
"(II)F",
&g_MotionEvent_getHistoricalTouchMinorF_I_I);
@@ -1801,11 +1793,11 @@ static jfloat Java_MotionEvent_getHistoricalToolMajorF_I_I(JNIEnv* env, jobject
JniIntWrapper p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalToolMajor",
"(II)F",
&g_MotionEvent_getHistoricalToolMajorF_I_I);
@@ -1826,11 +1818,11 @@ static jfloat Java_MotionEvent_getHistoricalToolMinorF_I_I(JNIEnv* env, jobject
JniIntWrapper p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalToolMinor",
"(II)F",
&g_MotionEvent_getHistoricalToolMinorF_I_I);
@@ -1851,11 +1843,11 @@ static jfloat Java_MotionEvent_getHistoricalOrientationF_I_I(JNIEnv* env,
JniIntWrapper p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalOrientation",
"(II)F",
&g_MotionEvent_getHistoricalOrientationF_I_I);
@@ -1878,11 +1870,11 @@ static jfloat Java_MotionEvent_getHistoricalAxisValueF_I_I_I(JNIEnv* env,
JniIntWrapper p2) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalAxisValue",
"(III)F",
&g_MotionEvent_getHistoricalAxisValueF_I_I_I);
@@ -1905,11 +1897,11 @@ static void Java_MotionEvent_getHistoricalPointerCoords(JNIEnv* env, jobject
jobject p2) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getHistoricalPointerCoords",
"(IILandroid/view/MotionEvent$PointerCoords;)V",
&g_MotionEvent_getHistoricalPointerCoords);
@@ -1926,11 +1918,11 @@ static jint Java_MotionEvent_getEdgeFlags(JNIEnv* env, jobject obj)
static jint Java_MotionEvent_getEdgeFlags(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), 0);
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"getEdgeFlags",
"()I",
&g_MotionEvent_getEdgeFlags);
@@ -1949,11 +1941,11 @@ static void Java_MotionEvent_setEdgeFlags(JNIEnv* env, jobject obj,
JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"setEdgeFlags",
"(I)V",
&g_MotionEvent_setEdgeFlags);
@@ -1971,11 +1963,11 @@ static void Java_MotionEvent_setAction(JNIEnv* env, jobject obj, JniIntWrapper
p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"setAction",
"(I)V",
&g_MotionEvent_setAction);
@@ -1993,11 +1985,11 @@ static void Java_MotionEvent_offsetLocation(JNIEnv* env, jobject obj, jfloat p0,
jfloat p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"offsetLocation",
"(FF)V",
&g_MotionEvent_offsetLocation);
@@ -2015,11 +2007,11 @@ static void Java_MotionEvent_setLocation(JNIEnv* env, jobject obj, jfloat p0,
jfloat p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"setLocation",
"(FF)V",
&g_MotionEvent_setLocation);
@@ -2036,11 +2028,11 @@ static void Java_MotionEvent_transform(JNIEnv* env, jobject obj, jobject p0)
static void Java_MotionEvent_transform(JNIEnv* env, jobject obj, jobject p0) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"transform",
"(Landroid/graphics/Matrix;)V",
&g_MotionEvent_transform);
@@ -2068,11 +2060,11 @@ static void Java_MotionEvent_addBatchV_J_F_F_F_F_I(JNIEnv* env, jobject obj,
JniIntWrapper p5) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"addBatch",
"(JFFFFI)V",
&g_MotionEvent_addBatchV_J_F_F_F_F_I);
@@ -2094,11 +2086,11 @@ static void Java_MotionEvent_addBatchV_J_LAVMEPC_I(JNIEnv* env, jobject obj,
JniIntWrapper p2) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"addBatch",
"(J[Landroid/view/MotionEvent$PointerCoords;I)V",
&g_MotionEvent_addBatchV_J_LAVMEPC_I);
@@ -2117,11 +2109,11 @@ static base::android::ScopedJavaLocalRef<jstring>
Java_MotionEvent_toString(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env), NULL);
+ g_MotionEvent_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"toString",
"()Ljava/lang/String;",
&g_MotionEvent_toString);
@@ -2140,18 +2132,18 @@ static base::android::ScopedJavaLocalRef<jstring>
static base::android::ScopedJavaLocalRef<jstring>
Java_MotionEvent_actionToString(JNIEnv* env, JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, MotionEvent_clazz(env),
- MotionEvent_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_MotionEvent_clazz,
+ g_MotionEvent_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"actionToString",
"(I)Ljava/lang/String;",
&g_MotionEvent_actionToString);
jstring ret =
- static_cast<jstring>(env->CallStaticObjectMethod(MotionEvent_clazz(env),
+ static_cast<jstring>(env->CallStaticObjectMethod(g_MotionEvent_clazz,
method_id, as_jint(p0)));
jni_generator::CheckException(env);
return base::android::ScopedJavaLocalRef<jstring>(env, ret);
@@ -2164,18 +2156,18 @@ static base::android::ScopedJavaLocalRef<jstring>
static base::android::ScopedJavaLocalRef<jstring>
Java_MotionEvent_axisToString(JNIEnv* env, JniIntWrapper p0) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, MotionEvent_clazz(env),
- MotionEvent_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_MotionEvent_clazz,
+ g_MotionEvent_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"axisToString",
"(I)Ljava/lang/String;",
&g_MotionEvent_axisToString);
jstring ret =
- static_cast<jstring>(env->CallStaticObjectMethod(MotionEvent_clazz(env),
+ static_cast<jstring>(env->CallStaticObjectMethod(g_MotionEvent_clazz,
method_id, as_jint(p0)));
jni_generator::CheckException(env);
return base::android::ScopedJavaLocalRef<jstring>(env, ret);
@@ -2186,18 +2178,18 @@ static jint Java_MotionEvent_axisFromString(JNIEnv* env, jstring p0)
__attribute__ ((unused));
static jint Java_MotionEvent_axisFromString(JNIEnv* env, jstring p0) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, MotionEvent_clazz(env),
- MotionEvent_clazz(env), 0);
+ CHECK_CLAZZ(env, g_MotionEvent_clazz,
+ g_MotionEvent_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"axisFromString",
"(Ljava/lang/String;)I",
&g_MotionEvent_axisFromString);
jint ret =
- env->CallStaticIntMethod(MotionEvent_clazz(env),
+ env->CallStaticIntMethod(g_MotionEvent_clazz,
method_id, p0);
jni_generator::CheckException(env);
return ret;
@@ -2210,11 +2202,11 @@ static void Java_MotionEvent_writeToParcel(JNIEnv* env, jobject obj, jobject p0,
JniIntWrapper p1) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- MotionEvent_clazz(env));
+ g_MotionEvent_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, MotionEvent_clazz(env),
+ env, g_MotionEvent_clazz,
"writeToParcel",
"(Landroid/os/Parcel;I)V",
&g_MotionEvent_writeToParcel);
diff --git a/base/android/jni_generator/testEagerCalledByNativesOption.golden b/base/android/jni_generator/testEagerCalledByNativesOption.golden
index f2b224b..4ff81ac 100644
--- a/base/android/jni_generator/testEagerCalledByNativesOption.golden
+++ b/base/android/jni_generator/testEagerCalledByNativesOption.golden
@@ -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
jmethodID g_Test_testMethodWithParam = NULL;
jmethodID g_Test_testStaticMethodWithParam = NULL;
jmethodID g_Test_testMethodWithNoParam = NULL;
@@ -54,21 +46,20 @@ static void testMethodWithParam(JNIEnv* env, jobject obj, JniIntWrapper iParam)
}
static jint testStaticMethodWithParam(JNIEnv* env, JniIntWrapper iParam) {
- jint ret = env->CallStaticIntMethod(Test_clazz(env),
+ jint ret = env->CallStaticIntMethod(g_Test_clazz,
g_Test_testStaticMethodWithParam, as_jint(iParam));
return ret;
}
static jdouble testMethodWithNoParam(JNIEnv* env) {
- jdouble ret = env->CallStaticDoubleMethod(Test_clazz(env),
+ jdouble ret = env->CallStaticDoubleMethod(g_Test_clazz,
g_Test_testMethodWithNoParam);
return ret;
}
static base::android::ScopedJavaLocalRef<jstring>
testStaticMethodWithNoParam(JNIEnv* env) {
- jstring ret =
- static_cast<jstring>(env->CallStaticObjectMethod(Test_clazz(env),
+ jstring ret = static_cast<jstring>(env->CallStaticObjectMethod(g_Test_clazz,
g_Test_testStaticMethodWithNoParam));
return base::android::ScopedJavaLocalRef<jstring>(env, ret);
}
@@ -90,16 +81,16 @@ static bool RegisterNativesImpl(JNIEnv* env, jclass clazz) {
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;
}
g_Test_testMethodWithParam = env->GetMethodID(
- Test_clazz(env),
+ g_Test_clazz,
"testMethodWithParam",
"("
"I"
@@ -110,7 +101,7 @@ static bool RegisterNativesImpl(JNIEnv* env, jclass clazz) {
}
g_Test_testStaticMethodWithParam = env->GetStaticMethodID(
- Test_clazz(env),
+ g_Test_clazz,
"testStaticMethodWithParam",
"("
"I"
@@ -121,7 +112,7 @@ static bool RegisterNativesImpl(JNIEnv* env, jclass clazz) {
}
g_Test_testMethodWithNoParam = env->GetStaticMethodID(
- Test_clazz(env),
+ g_Test_clazz,
"testMethodWithNoParam",
"("
")"
@@ -131,7 +122,7 @@ static bool RegisterNativesImpl(JNIEnv* env, jclass clazz) {
}
g_Test_testStaticMethodWithNoParam = env->GetStaticMethodID(
- Test_clazz(env),
+ g_Test_clazz,
"testStaticMethodWithNoParam",
"("
")"
diff --git a/base/android/jni_generator/testFromJavaP.golden b/base/android/jni_generator/testFromJavaP.golden
index 29364b3..34e2118 100644
--- a/base/android/jni_generator/testFromJavaP.golden
+++ b/base/android/jni_generator/testFromJavaP.golden
@@ -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 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
@@ -42,11 +34,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,
- InputStream_clazz(env), 0);
+ g_InputStream_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InputStream_clazz(env),
+ env, g_InputStream_clazz,
"available",
"()I",
&g_InputStream_available);
@@ -64,11 +56,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,
- InputStream_clazz(env));
+ g_InputStream_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InputStream_clazz(env),
+ env, g_InputStream_clazz,
"close",
"()V",
&g_InputStream_close);
@@ -85,11 +77,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,
- InputStream_clazz(env));
+ g_InputStream_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InputStream_clazz(env),
+ env, g_InputStream_clazz,
"mark",
"(I)V",
&g_InputStream_mark);
@@ -106,11 +98,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,
- InputStream_clazz(env), false);
+ g_InputStream_clazz, false);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InputStream_clazz(env),
+ env, g_InputStream_clazz,
"markSupported",
"()Z",
&g_InputStream_markSupported);
@@ -128,11 +120,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,
- InputStream_clazz(env), 0);
+ g_InputStream_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InputStream_clazz(env),
+ env, g_InputStream_clazz,
"read",
"()I",
&g_InputStream_readI);
@@ -150,11 +142,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,
- InputStream_clazz(env), 0);
+ g_InputStream_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InputStream_clazz(env),
+ env, g_InputStream_clazz,
"read",
"([B)I",
&g_InputStream_readI_AB);
@@ -177,11 +169,11 @@ static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray
JniIntWrapper p2) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- InputStream_clazz(env), 0);
+ g_InputStream_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InputStream_clazz(env),
+ env, g_InputStream_clazz,
"read",
"([BII)I",
&g_InputStream_readI_AB_I_I);
@@ -199,11 +191,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,
- InputStream_clazz(env));
+ g_InputStream_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InputStream_clazz(env),
+ env, g_InputStream_clazz,
"reset",
"()V",
&g_InputStream_reset);
@@ -220,11 +212,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,
- InputStream_clazz(env), 0);
+ g_InputStream_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InputStream_clazz(env),
+ env, g_InputStream_clazz,
"skip",
"(J)J",
&g_InputStream_skip);
@@ -242,18 +234,18 @@ static base::android::ScopedJavaLocalRef<jobject>
static base::android::ScopedJavaLocalRef<jobject>
Java_InputStream_Constructor(JNIEnv* env) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, InputStream_clazz(env),
- InputStream_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_InputStream_clazz,
+ g_InputStream_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InputStream_clazz(env),
+ env, g_InputStream_clazz,
"<init>",
"()V",
&g_InputStream_Constructor);
jobject ret =
- env->NewObject(InputStream_clazz(env),
+ env->NewObject(g_InputStream_clazz,
method_id);
jni_generator::CheckException(env);
return base::android::ScopedJavaLocalRef<jobject>(env, ret);
diff --git a/base/android/jni_generator/testFromJavaPGenerics.golden b/base/android/jni_generator/testFromJavaPGenerics.golden
index e4df769..48582fd 100644
--- a/base/android/jni_generator/testFromJavaPGenerics.golden
+++ b/base/android/jni_generator/testFromJavaPGenerics.golden
@@ -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 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
@@ -42,11 +34,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,
- HashSet_clazz(env));
+ g_HashSet_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, HashSet_clazz(env),
+ env, g_HashSet_clazz,
"dummy",
"()V",
&g_HashSet_dummy);
diff --git a/base/android/jni_generator/testInnerClassNatives.golden b/base/android/jni_generator/testInnerClassNatives.golden
index e1909fd..56a2e9b2 100644
--- a/base/android/jni_generator/testInnerClassNatives.golden
+++ b/base/android/jni_generator/testInnerClassNatives.golden
@@ -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.
@@ -20,16 +20,8 @@
namespace {
const char kTestJniClassPath[] = "org/chromium/TestJni";
const char kMyInnerClassClassPath[] = "org/chromium/TestJni$MyInnerClass";
-#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_TestJni_clazz = NULL;
-jclass TestJni_clazz(JNIEnv*) { return g_TestJni_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
} // namespace
@@ -52,11 +44,11 @@ static bool RegisterNativesImpl(JNIEnv* env) {
const int kMethodsMyInnerClassSize = arraysize(kMethodsMyInnerClass);
- if (env->RegisterNatives(MyInnerClass_clazz(env),
+ if (env->RegisterNatives(g_MyInnerClass_clazz,
kMethodsMyInnerClass,
kMethodsMyInnerClassSize) < 0) {
jni_generator::HandleRegistrationError(
- env, MyInnerClass_clazz(env), __FILE__);
+ env, g_MyInnerClass_clazz, __FILE__);
return false;
}
diff --git a/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden b/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden
index 2fd0986..07b857f 100644
--- a/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden
+++ b/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden
@@ -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.
@@ -21,16 +21,8 @@ namespace {
const char kMyOtherInnerClassClassPath[] =
"org/chromium/TestJni$MyOtherInnerClass";
const char kTestJniClassPath[] = "org/chromium/TestJni";
-#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_TestJni_clazz = NULL;
-jclass TestJni_clazz(JNIEnv*) { return g_TestJni_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
} // namespace
@@ -63,21 +55,21 @@ static bool RegisterNativesImpl(JNIEnv* env) {
const int kMethodsMyOtherInnerClassSize =
arraysize(kMethodsMyOtherInnerClass);
- if (env->RegisterNatives(MyOtherInnerClass_clazz(env),
+ if (env->RegisterNatives(g_MyOtherInnerClass_clazz,
kMethodsMyOtherInnerClass,
kMethodsMyOtherInnerClassSize) < 0) {
jni_generator::HandleRegistrationError(
- env, MyOtherInnerClass_clazz(env), __FILE__);
+ env, g_MyOtherInnerClass_clazz, __FILE__);
return false;
}
const int kMethodsTestJniSize = arraysize(kMethodsTestJni);
- if (env->RegisterNatives(TestJni_clazz(env),
+ if (env->RegisterNatives(g_TestJni_clazz,
kMethodsTestJni,
kMethodsTestJniSize) < 0) {
jni_generator::HandleRegistrationError(
- env, TestJni_clazz(env), __FILE__);
+ env, g_TestJni_clazz, __FILE__);
return false;
}
diff --git a/base/android/jni_generator/testInnerClassNativesMultiple.golden b/base/android/jni_generator/testInnerClassNativesMultiple.golden
index e557e63..6a7f04d 100644
--- a/base/android/jni_generator/testInnerClassNativesMultiple.golden
+++ b/base/android/jni_generator/testInnerClassNativesMultiple.golden
@@ -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.
@@ -22,16 +22,8 @@ const char kMyOtherInnerClassClassPath[] =
"org/chromium/TestJni$MyOtherInnerClass";
const char kTestJniClassPath[] = "org/chromium/TestJni";
const char kMyInnerClassClassPath[] = "org/chromium/TestJni$MyInnerClass";
-#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_TestJni_clazz = NULL;
-jclass TestJni_clazz(JNIEnv*) { return g_TestJni_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
} // namespace
@@ -64,21 +56,21 @@ static bool RegisterNativesImpl(JNIEnv* env) {
const int kMethodsMyOtherInnerClassSize =
arraysize(kMethodsMyOtherInnerClass);
- if (env->RegisterNatives(MyOtherInnerClass_clazz(env),
+ if (env->RegisterNatives(g_MyOtherInnerClass_clazz,
kMethodsMyOtherInnerClass,
kMethodsMyOtherInnerClassSize) < 0) {
jni_generator::HandleRegistrationError(
- env, MyOtherInnerClass_clazz(env), __FILE__);
+ env, g_MyOtherInnerClass_clazz, __FILE__);
return false;
}
const int kMethodsMyInnerClassSize = arraysize(kMethodsMyInnerClass);
- if (env->RegisterNatives(MyInnerClass_clazz(env),
+ if (env->RegisterNatives(g_MyInnerClass_clazz,
kMethodsMyInnerClass,
kMethodsMyInnerClassSize) < 0) {
jni_generator::HandleRegistrationError(
- env, MyInnerClass_clazz(env), __FILE__);
+ env, g_MyInnerClass_clazz, __FILE__);
return false;
}
diff --git a/base/android/jni_generator/testJNIInitNativeNameOption.golden b/base/android/jni_generator/testJNIInitNativeNameOption.golden
index 1ddaa66..0d5d3c6 100644
--- a/base/android/jni_generator/testJNIInitNativeNameOption.golden
+++ b/base/android/jni_generator/testJNIInitNativeNameOption.golden
@@ -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
@@ -57,11 +49,11 @@ static bool RegisterNativesImpl(JNIEnv* env, jclass clazz) {
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;
}
diff --git a/base/android/jni_generator/testJarJarRemapping.golden b/base/android/jni_generator/testJarJarRemapping.golden
index 3325db0..9b2c0b3 100644
--- a/base/android/jni_generator/testJarJarRemapping.golden
+++ b/base/android/jni_generator/testJarJarRemapping.golden
@@ -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 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
@@ -77,11 +69,11 @@ static bool RegisterNativesImpl(JNIEnv* env) {
const int kMethodsExampleSize = arraysize(kMethodsExample);
- if (env->RegisterNatives(Example_clazz(env),
+ if (env->RegisterNatives(g_Example_clazz,
kMethodsExample,
kMethodsExampleSize) < 0) {
jni_generator::HandleRegistrationError(
- env, Example_clazz(env), __FILE__);
+ env, g_Example_clazz, __FILE__);
return false;
}
diff --git a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
index 49f510b..9cc1256 100644
--- a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
+++ b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
@@ -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 kFooClassPath[] = "org/chromium/foo/Foo";
-#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_Foo_clazz = NULL;
-jclass Foo_clazz(JNIEnv*) { return g_Foo_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
} // namespace
@@ -42,12 +34,12 @@ static base::subtle::AtomicWord g_Foo_calledByNative = 0;
static void Java_Foo_calledByNative(JNIEnv* env, jobject callback1,
jobject callback2) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, Foo_clazz(env),
- Foo_clazz(env));
+ CHECK_CLAZZ(env, g_Foo_clazz,
+ g_Foo_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, Foo_clazz(env),
+ env, g_Foo_clazz,
"calledByNative",
"("
@@ -57,7 +49,7 @@ static void Java_Foo_calledByNative(JNIEnv* env, jobject callback1,
"V",
&g_Foo_calledByNative);
- env->CallStaticVoidMethod(Foo_clazz(env),
+ env->CallStaticVoidMethod(g_Foo_clazz,
method_id, callback1, callback2);
jni_generator::CheckException(env);
@@ -80,11 +72,11 @@ static bool RegisterNativesImpl(JNIEnv* env) {
const int kMethodsFooSize = arraysize(kMethodsFoo);
- if (env->RegisterNatives(Foo_clazz(env),
+ if (env->RegisterNatives(g_Foo_clazz,
kMethodsFoo,
kMethodsFooSize) < 0) {
jni_generator::HandleRegistrationError(
- env, Foo_clazz(env), __FILE__);
+ env, g_Foo_clazz, __FILE__);
return false;
}
diff --git a/base/android/jni_generator/testNativeExportsOption.golden b/base/android/jni_generator/testNativeExportsOption.golden
index 9c25801..231be7c 100644
--- a/base/android/jni_generator/testNativeExportsOption.golden
+++ b/base/android/jni_generator/testNativeExportsOption.golden
@@ -20,19 +20,8 @@
namespace {
const char kSampleForTestsClassPath[] =
"org/chromium/example/jni_generator/SampleForTests";
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
-#endif
// Leaking this jclass as we cannot use LazyInstance from some threads.
-base::subtle::AtomicWord g_SampleForTests_clazz = 0;
-jclass SampleForTests_clazz(JNIEnv* env) {
- return base::android::LazyGetClass(env, kSampleForTestsClassPath,
- &g_SampleForTests_clazz);
-}
-#if __clang__
-#pragma clang diagnostic pop
-#endif
+jclass g_SampleForTests_clazz = NULL;
} // namespace
@@ -90,11 +79,11 @@ static void Java_SampleForTests_testMethodWithParam(JNIEnv* env, jobject obj,
JniIntWrapper iParam) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- SampleForTests_clazz(env));
+ g_SampleForTests_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, SampleForTests_clazz(env),
+ env, g_SampleForTests_clazz,
"testMethodWithParam",
"("
@@ -116,11 +105,11 @@ static base::android::ScopedJavaLocalRef<jstring>
JniIntWrapper iParam) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- SampleForTests_clazz(env), NULL);
+ g_SampleForTests_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, SampleForTests_clazz(env),
+ env, g_SampleForTests_clazz,
"testMethodWithParamAndReturn",
"("
@@ -140,12 +129,12 @@ static base::subtle::AtomicWord g_SampleForTests_testStaticMethodWithParam = 0;
static jint Java_SampleForTests_testStaticMethodWithParam(JNIEnv* env,
JniIntWrapper iParam) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, SampleForTests_clazz(env),
- SampleForTests_clazz(env), 0);
+ CHECK_CLAZZ(env, g_SampleForTests_clazz,
+ g_SampleForTests_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, SampleForTests_clazz(env),
+ env, g_SampleForTests_clazz,
"testStaticMethodWithParam",
"("
@@ -155,7 +144,7 @@ static jint Java_SampleForTests_testStaticMethodWithParam(JNIEnv* env,
&g_SampleForTests_testStaticMethodWithParam);
jint ret =
- env->CallStaticIntMethod(SampleForTests_clazz(env),
+ env->CallStaticIntMethod(g_SampleForTests_clazz,
method_id, as_jint(iParam));
jni_generator::CheckException(env);
return ret;
@@ -164,12 +153,12 @@ static jint Java_SampleForTests_testStaticMethodWithParam(JNIEnv* env,
static base::subtle::AtomicWord g_SampleForTests_testMethodWithNoParam = 0;
static jdouble Java_SampleForTests_testMethodWithNoParam(JNIEnv* env) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, SampleForTests_clazz(env),
- SampleForTests_clazz(env), 0);
+ CHECK_CLAZZ(env, g_SampleForTests_clazz,
+ g_SampleForTests_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, SampleForTests_clazz(env),
+ env, g_SampleForTests_clazz,
"testMethodWithNoParam",
"("
@@ -178,7 +167,7 @@ static jdouble Java_SampleForTests_testMethodWithNoParam(JNIEnv* env) {
&g_SampleForTests_testMethodWithNoParam);
jdouble ret =
- env->CallStaticDoubleMethod(SampleForTests_clazz(env),
+ env->CallStaticDoubleMethod(g_SampleForTests_clazz,
method_id);
jni_generator::CheckException(env);
return ret;
@@ -189,12 +178,12 @@ static base::subtle::AtomicWord g_SampleForTests_testStaticMethodWithNoParam =
static base::android::ScopedJavaLocalRef<jstring>
Java_SampleForTests_testStaticMethodWithNoParam(JNIEnv* env) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, SampleForTests_clazz(env),
- SampleForTests_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_SampleForTests_clazz,
+ g_SampleForTests_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, SampleForTests_clazz(env),
+ env, g_SampleForTests_clazz,
"testStaticMethodWithNoParam",
"("
@@ -203,7 +192,7 @@ static base::android::ScopedJavaLocalRef<jstring>
&g_SampleForTests_testStaticMethodWithNoParam);
jstring ret =
-static_cast<jstring>(env->CallStaticObjectMethod(SampleForTests_clazz(env),
+ static_cast<jstring>(env->CallStaticObjectMethod(g_SampleForTests_clazz,
method_id));
jni_generator::CheckException(env);
return base::android::ScopedJavaLocalRef<jstring>(env, ret);
@@ -213,8 +202,7 @@ static_cast<jstring>(env->CallStaticObjectMethod(SampleForTests_clazz(env),
// Step 3: RegisterNatives.
static bool RegisterNativesImpl(JNIEnv* env, jclass clazz) {
- base::subtle::Release_Store(&g_SampleForTests_clazz,
- static_cast<base::subtle::AtomicWord>(env->NewWeakGlobalRef(clazz));
+ g_SampleForTests_clazz = static_cast<jclass>(env->NewWeakGlobalRef(clazz));
return true;
}
diff --git a/base/android/jni_generator/testNatives.golden b/base/android/jni_generator/testNatives.golden
index e016aa1..db69a5a 100644
--- a/base/android/jni_generator/testNatives.golden
+++ b/base/android/jni_generator/testNatives.golden
@@ -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 kTestJniClassPath[] = "org/chromium/TestJni";
-#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_TestJni_clazz = NULL;
-jclass TestJni_clazz(JNIEnv*) { return g_TestJni_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
} // namespace
@@ -210,11 +202,11 @@ static bool RegisterNativesImpl(JNIEnv* env) {
const int kMethodsTestJniSize = arraysize(kMethodsTestJni);
- if (env->RegisterNatives(TestJni_clazz(env),
+ if (env->RegisterNatives(g_TestJni_clazz,
kMethodsTestJni,
kMethodsTestJniSize) < 0) {
jni_generator::HandleRegistrationError(
- env, TestJni_clazz(env), __FILE__);
+ env, g_TestJni_clazz, __FILE__);
return false;
}
diff --git a/base/android/jni_generator/testNativesLong.golden b/base/android/jni_generator/testNativesLong.golden
index 6fafb56..25b5fad 100644
--- a/base/android/jni_generator/testNativesLong.golden
+++ b/base/android/jni_generator/testNativesLong.golden
@@ -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 kTestJniClassPath[] = "org/chromium/TestJni";
-#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_TestJni_clazz = NULL;
-jclass TestJni_clazz(JNIEnv*) { return g_TestJni_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
} // namespace
@@ -57,11 +49,11 @@ static bool RegisterNativesImpl(JNIEnv* env) {
const int kMethodsTestJniSize = arraysize(kMethodsTestJni);
- if (env->RegisterNatives(TestJni_clazz(env),
+ if (env->RegisterNatives(g_TestJni_clazz,
kMethodsTestJni,
kMethodsTestJniSize) < 0) {
jni_generator::HandleRegistrationError(
- env, TestJni_clazz(env), __FILE__);
+ env, g_TestJni_clazz, __FILE__);
return false;
}
diff --git a/base/android/jni_generator/testPureNativeMethodsOption.golden b/base/android/jni_generator/testPureNativeMethodsOption.golden
index 84efd54..8d9ee9e 100644
--- a/base/android/jni_generator/testPureNativeMethodsOption.golden
+++ b/base/android/jni_generator/testPureNativeMethodsOption.golden
@@ -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 @@ static bool RegisterNativesImpl(JNIEnv* env) {
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;
}
diff --git a/base/android/jni_generator/testSingleJNIAdditionalImport.golden b/base/android/jni_generator/testSingleJNIAdditionalImport.golden
index 2c48306..e395657 100644
--- a/base/android/jni_generator/testSingleJNIAdditionalImport.golden
+++ b/base/android/jni_generator/testSingleJNIAdditionalImport.golden
@@ -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 kFooClassPath[] = "org/chromium/foo/Foo";
-#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_Foo_clazz = NULL;
-jclass Foo_clazz(JNIEnv*) { return g_Foo_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
} // namespace
@@ -40,12 +32,12 @@ static void DoSomething(JNIEnv* env, jclass jcaller,
static base::subtle::AtomicWord g_Foo_calledByNative = 0;
static void Java_Foo_calledByNative(JNIEnv* env, jobject callback) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, Foo_clazz(env),
- Foo_clazz(env));
+ CHECK_CLAZZ(env, g_Foo_clazz,
+ g_Foo_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, Foo_clazz(env),
+ env, g_Foo_clazz,
"calledByNative",
"("
@@ -54,7 +46,7 @@ static void Java_Foo_calledByNative(JNIEnv* env, jobject callback) {
"V",
&g_Foo_calledByNative);
- env->CallStaticVoidMethod(Foo_clazz(env),
+ env->CallStaticVoidMethod(g_Foo_clazz,
method_id, callback);
jni_generator::CheckException(env);
@@ -76,11 +68,11 @@ static bool RegisterNativesImpl(JNIEnv* env) {
const int kMethodsFooSize = arraysize(kMethodsFoo);
- if (env->RegisterNatives(Foo_clazz(env),
+ if (env->RegisterNatives(g_Foo_clazz,
kMethodsFoo,
kMethodsFooSize) < 0) {
jni_generator::HandleRegistrationError(
- env, Foo_clazz(env), __FILE__);
+ env, g_Foo_clazz, __FILE__);
return false;
}
diff --git a/base/android/jni_utils.cc b/base/android/jni_utils.cc
deleted file mode 100644
index b4d682b..0000000
--- a/base/android/jni_utils.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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.
-
-#include "base/android/jni_utils.h"
-
-#include "base/android/jni_android.h"
-#include "base/android/scoped_java_ref.h"
-
-#include "jni/JNIUtils_jni.h"
-
-namespace base {
-namespace android {
-
-ScopedJavaLocalRef<jobject> GetClassLoader(JNIEnv* env) {
- return Java_JNIUtils_getClassLoader(env);
-}
-
-bool RegisterJNIUtils(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
-} // namespace android
-} // namespace base
-
diff --git a/base/android/jni_utils.h b/base/android/jni_utils.h
deleted file mode 100644
index b793aed..0000000
--- a/base/android/jni_utils.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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.
-
-#ifndef BASE_ANDROID_JNI_UTILS_H_
-#define BASE_ANDROID_JNI_UTILS_H_
-
-#include <jni.h>
-
-#include "base/android/scoped_java_ref.h"
-
-namespace base {
-
-namespace android {
-
-// Gets a ClassLoader instance capable of loading Chromium java classes.
-// This should be called either from JNI_OnLoad or from within a method called
-// via JNI from Java.
-BASE_EXPORT ScopedJavaLocalRef<jobject> GetClassLoader(JNIEnv* env);
-
-bool RegisterJNIUtils(JNIEnv* env);
-
-} // namespace android
-} // namespace base
-
-#endif // BASE_ANDROID_JNI_UTILS_H_
-
diff --git a/base/base.gyp b/base/base.gyp
index d3c397c..ee19b8b 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1282,7 +1282,6 @@
'android/java/src/org/chromium/base/EventLog.java',
'android/java/src/org/chromium/base/FieldTrialList.java',
'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java',
- 'android/java/src/org/chromium/base/JNIUtils.java',
'android/java/src/org/chromium/base/library_loader/LibraryLoader.java',
'android/java/src/org/chromium/base/MemoryPressureListener.java',
'android/java/src/org/chromium/base/JavaHandlerThread.java',
diff --git a/base/base.gypi b/base/base.gypi
index cfa9d61..8a3a56c 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -55,8 +55,6 @@
'android/jni_registrar.h',
'android/jni_string.cc',
'android/jni_string.h',
- 'android/jni_utils.cc',
- 'android/jni_utils.h',
'android/jni_weak_ref.cc',
'android/jni_weak_ref.h',
'android/library_loader/library_loader_hooks.cc',
diff --git a/ui/gl/android/scoped_java_surface.cc b/ui/gl/android/scoped_java_surface.cc
index ae4f81a..36f635f 100644
--- a/ui/gl/android/scoped_java_surface.cc
+++ b/ui/gl/android/scoped_java_surface.cc
@@ -32,7 +32,7 @@ ScopedJavaSurface::ScopedJavaSurface(
is_protected_(false) {
JNIEnv* env = base::android::AttachCurrentThread();
RegisterNativesIfNeeded(env);
- DCHECK(env->IsInstanceOf(surface.obj(), Surface_clazz(env)));
+ DCHECK(env->IsInstanceOf(surface.obj(), g_Surface_clazz));
j_surface_.Reset(surface);
}
generated by cgit v1.1 at 2025-03-14 12:27:51 +0000