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

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

Issue 960873002: Update from https://crrev.com/318214 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/testNativeExportsOption.golden
diff --git a/base/android/jni_generator/testNativeExportsOption.golden b/base/android/jni_generator/testNativeExportsOption.golden
index a4953cc3ea4a5b4ac2a48b6f7e51ac3be6718f19..395fc390e34f1475f8d276ef39c0c04ba2064fde 100644
--- a/base/android/jni_generator/testNativeExportsOption.golden
+++ b/base/android/jni_generator/testNativeExportsOption.golden
@@ -30,17 +30,21 @@ extern "C" {
static jint Init(JNIEnv* env, jobject jcaller);
-__attribute__((visibility("default"), alias("Init")))
+__attribute__((visibility("default")))
jint
Java_org_chromium_example_jni_1generator_SampleForTests_00024MyInnerClass_nativeInit(JNIEnv*
- env, jobject jcaller);
+ env, jobject jcaller) {
+ return Init(env, jcaller);
+}
static jint Init(JNIEnv* env, jobject jcaller);
-__attribute__((visibility("default"), alias("Init")))
+__attribute__((visibility("default")))
jint
Java_org_chromium_example_jni_1generator_SampleForTests_00024MyOtherInnerClass_nativeInit(JNIEnv*
- env, jobject jcaller);
+ env, jobject jcaller) {
+ return Init(env, jcaller);
+}
}; // extern "C"
@@ -199,7 +203,8 @@ 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,
+
+ base::subtle::Release_Store(&g_SampleForTests_clazz,
static_cast<base::subtle::AtomicWord>(env->NewWeakGlobalRef(clazz));
return true;

Powered by Google App Engine
This is Rietveld 408576698