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

Unified Diff: base/android/jni_generator/testMultipleJNIAdditionalImport.golden

Issue 2162923002: jni_generator: Always generate native exports. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/android/jni_generator/testMultipleJNIAdditionalImport.golden
diff --git a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
index 6de8c219f551e4add8f8d75b9abdb094682235a2..c9b297f79757ed588dd8e1c8a8f20ad2c00baaab 100644
--- a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
+++ b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
@@ -20,8 +20,8 @@
namespace {
const char kFooClassPath[] = "org/chromium/foo/Foo";
// Leaking this jclass as we cannot use LazyInstance from some threads.
-jclass g_Foo_clazz = NULL;
-#define Foo_clazz(env) g_Foo_clazz
+base::subtle::AtomicWord g_Foo_clazz __attribute__((unused)) = 0;
+#define Foo_clazz(env) base::android::LazyGetClass(env, kFooClassPath, &g_Foo_clazz)
} // namespace
@@ -31,8 +31,8 @@ static void DoSomething(JNIEnv* env, const JavaParamRef<jclass>& jcaller,
const JavaParamRef<jobject>& callback1,
const JavaParamRef<jobject>& callback2);
-static void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv* env, jclass
- jcaller,
+extern "C" __attribute__((visibility("default")))
+void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv* env, jclass jcaller,
jobject callback1,
jobject callback2) {
return DoSomething(env, JavaParamRef<jclass>(env, jcaller),
@@ -77,9 +77,7 @@ static const JNINativeMethod kMethodsFoo[] = {
};
static bool RegisterNativesImpl(JNIEnv* env) {
-
- g_Foo_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
- base::android::GetClass(env, kFooClassPath).obj()));
+ if (base::android::IsManualJniRegistrationDisabled()) return true;
const int kMethodsFooSize = arraysize(kMethodsFoo);

Powered by Google App Engine
This is Rietveld 408576698