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

Unified Diff: base/android/jni_generator/testSingleJNIAdditionalImport.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
« no previous file with comments | « base/android/jni_generator/testNativesLong.golden ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/jni_generator/testSingleJNIAdditionalImport.golden
diff --git a/base/android/jni_generator/testSingleJNIAdditionalImport.golden b/base/android/jni_generator/testSingleJNIAdditionalImport.golden
index 1b2895eefce62c92f9d6ca0963b06461aa937f6f..0aa0f36611aa2df862c7788dba759d6938283c4e 100644
--- a/base/android/jni_generator/testSingleJNIAdditionalImport.golden
+++ b/base/android/jni_generator/testSingleJNIAdditionalImport.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
@@ -30,8 +30,8 @@ jclass g_Foo_clazz = NULL;
static void DoSomething(JNIEnv* env, const JavaParamRef<jclass>& jcaller,
const JavaParamRef<jobject>& callback);
-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 callback) {
return DoSomething(env, JavaParamRef<jclass>(env, jcaller),
JavaParamRef<jobject>(env, callback));
@@ -71,9 +71,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);
« no previous file with comments | « base/android/jni_generator/testNativesLong.golden ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698