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

Side by Side Diff: base/android/jni_generator/testSingleJNIAdditionalImport.golden

Issue 2146753002: Android: Remove unneeded RegisterNatives() calls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, more fixes Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file is autogenerated by 5 // This file is autogenerated by
6 // base/android/jni_generator/jni_generator.py 6 // base/android/jni_generator/jni_generator.py
7 // For 7 // For
8 // org/chromium/foo/Foo 8 // org/chromium/foo/Foo
9 9
10 #ifndef org_chromium_foo_Foo_JNI 10 #ifndef org_chromium_foo_Foo_JNI
(...skipping 21 matching lines...) Expand all
32 32
33 extern "C" __attribute__((visibility("default"))) 33 extern "C" __attribute__((visibility("default")))
34 void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv* env, jclass jcaller, 34 void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv* env, jclass jcaller,
35 jobject callback) { 35 jobject callback) {
36 return DoSomething(env, JavaParamRef<jclass>(env, jcaller), 36 return DoSomething(env, JavaParamRef<jclass>(env, jcaller),
37 JavaParamRef<jobject>(env, callback)); 37 JavaParamRef<jobject>(env, callback));
38 } 38 }
39 39
40 static base::subtle::AtomicWord g_Foo_calledByNative = 0; 40 static base::subtle::AtomicWord g_Foo_calledByNative = 0;
41 static void Java_Foo_calledByNative(JNIEnv* env, jobject callback) { 41 static void Java_Foo_calledByNative(JNIEnv* env, jobject callback) {
42 /* Must call RegisterNativesImpl() */
43 CHECK_CLAZZ(env, Foo_clazz(env), 42 CHECK_CLAZZ(env, Foo_clazz(env),
44 Foo_clazz(env)); 43 Foo_clazz(env));
45 jmethodID method_id = 44 jmethodID method_id =
46 base::android::MethodID::LazyGet< 45 base::android::MethodID::LazyGet<
47 base::android::MethodID::TYPE_STATIC>( 46 base::android::MethodID::TYPE_STATIC>(
48 env, Foo_clazz(env), 47 env, Foo_clazz(env),
49 "calledByNative", 48 "calledByNative",
50 49
51 "(" 50 "("
52 "Lorg/chromium/foo/Bar$Callback;" 51 "Lorg/chromium/foo/Bar$Callback;"
53 ")" 52 ")"
54 "V", 53 "V",
55 &g_Foo_calledByNative); 54 &g_Foo_calledByNative);
56 55
57 env->CallStaticVoidMethod(Foo_clazz(env), 56 env->CallStaticVoidMethod(Foo_clazz(env),
58 method_id, callback); 57 method_id, callback);
59 jni_generator::CheckException(env); 58 jni_generator::CheckException(env);
60 59
61 } 60 }
62 61
63 // Step 3: RegisterNatives.
64
65 static const JNINativeMethod kMethodsFoo[] = { 62 static const JNINativeMethod kMethodsFoo[] = {
66 { "nativeDoSomething", 63 { "nativeDoSomething",
67 "(" 64 "("
68 "Lorg/chromium/foo/Bar$Callback;" 65 "Lorg/chromium/foo/Bar$Callback;"
69 ")" 66 ")"
70 "V", reinterpret_cast<void*>(Java_org_chromium_foo_Foo_nativeDoSomething) }, 67 "V", reinterpret_cast<void*>(Java_org_chromium_foo_Foo_nativeDoSomething) },
71 }; 68 };
72 69
73 static bool RegisterNativesImpl(JNIEnv* env) { 70 static bool RegisterNativesImpl(JNIEnv* env) {
74 if (base::android::IsManualJniRegistrationDisabled()) return true; 71 if (base::android::IsManualJniRegistrationDisabled()) return true;
75 72
76 const int kMethodsFooSize = arraysize(kMethodsFoo); 73 const int kMethodsFooSize = arraysize(kMethodsFoo);
77 74
78 if (env->RegisterNatives(Foo_clazz(env), 75 if (env->RegisterNatives(Foo_clazz(env),
79 kMethodsFoo, 76 kMethodsFoo,
80 kMethodsFooSize) < 0) { 77 kMethodsFooSize) < 0) {
81 jni_generator::HandleRegistrationError( 78 jni_generator::HandleRegistrationError(
82 env, Foo_clazz(env), __FILE__); 79 env, Foo_clazz(env), __FILE__);
83 return false; 80 return false;
84 } 81 }
85 82
86 return true; 83 return true;
87 } 84 }
88 85
89 #endif // org_chromium_foo_Foo_JNI 86 #endif // org_chromium_foo_Foo_JNI
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698