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

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

Issue 2154293002: jni_generator: handle inner class natives properly. (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 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/TestJni 8 // org/chromium/TestJni
9 9
10 #ifndef org_chromium_TestJni_JNI 10 #ifndef org_chromium_TestJni_JNI
11 #define org_chromium_TestJni_JNI 11 #define org_chromium_TestJni_JNI
12 12
13 #include <jni.h> 13 #include <jni.h>
14 14
15 #include "base/android/jni_generator/jni_generator_helper.h" 15 #include "base/android/jni_generator/jni_generator_helper.h"
16 16
17 #include "base/android/jni_int_wrapper.h" 17 #include "base/android/jni_int_wrapper.h"
18 18
19 // Step 1: forward declarations. 19 // Step 1: forward declarations.
20 namespace { 20 namespace {
21 const char kTestJniClassPath[] = "org/chromium/TestJni"; 21 const char kTestJniClassPath[] = "org/chromium/TestJni";
22 const char kMyInnerClassClassPath[] = "org/chromium/TestJni$MyInnerClass"; 22 const char kMyInnerClassClassPath[] = "org/chromium/TestJni$MyInnerClass";
23 // Leaking this jclass as we cannot use LazyInstance from some threads. 23 // Leaking this jclass as we cannot use LazyInstance from some threads.
24 jclass g_TestJni_clazz = NULL; 24 jclass g_TestJni_clazz = NULL;
25 #define TestJni_clazz(env) g_TestJni_clazz 25 #define TestJni_clazz(env) g_TestJni_clazz
26 // Leaking this jclass as we cannot use LazyInstance from some threads.
27 jclass g_MyInnerClass_clazz = NULL;
28 #define MyInnerClass_clazz(env) g_MyInnerClass_clazz
26 29
27 } // namespace 30 } // namespace
28 31
29 // Step 2: method stubs. 32 // Step 2: method stubs.
30 33
31 static jint Init(JNIEnv* env, const JavaParamRef<jobject>& jcaller); 34 static jint Init(JNIEnv* env, const JavaParamRef<jobject>& jcaller);
32 35
33 static jint Java_org_chromium_TestJni_00024MyInnerClass_nativeInit(JNIEnv* env, 36 static jint Java_org_chromium_TestJni_00024MyInnerClass_nativeInit(JNIEnv* env,
34 jobject jcaller) { 37 jobject jcaller) {
35 return Init(env, JavaParamRef<jobject>(env, jcaller)); 38 return Init(env, JavaParamRef<jobject>(env, jcaller));
36 } 39 }
37 40
38 // Step 3: RegisterNatives. 41 // Step 3: RegisterNatives.
39 42
40 static const JNINativeMethod kMethodsMyInnerClass[] = { 43 static const JNINativeMethod kMethodsMyInnerClass[] = {
41 { "nativeInit", 44 { "nativeInit",
42 "(" 45 "("
43 ")" 46 ")"
44 "I", 47 "I",
45 reinterpret_cast<void*>(Java_org_chromium_TestJni_00024MyInnerClass_nativeIn it) 48 reinterpret_cast<void*>(Java_org_chromium_TestJni_00024MyInnerClass_nativeIn it)
46 }, 49 },
47 }; 50 };
48 51
49 static bool RegisterNativesImpl(JNIEnv* env) { 52 static bool RegisterNativesImpl(JNIEnv* env) {
50 53
51 g_TestJni_clazz = reinterpret_cast<jclass>(env->NewGlobalRef( 54 g_TestJni_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
52 base::android::GetClass(env, kTestJniClassPath).obj())); 55 base::android::GetClass(env, kTestJniClassPath).obj()));
56 g_MyInnerClass_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
57 base::android::GetClass(env, kMyInnerClassClassPath).obj()));
53 58
54 const int kMethodsMyInnerClassSize = arraysize(kMethodsMyInnerClass); 59 const int kMethodsMyInnerClassSize = arraysize(kMethodsMyInnerClass);
55 60
56 if (env->RegisterNatives(MyInnerClass_clazz(env), 61 if (env->RegisterNatives(MyInnerClass_clazz(env),
57 kMethodsMyInnerClass, 62 kMethodsMyInnerClass,
58 kMethodsMyInnerClassSize) < 0) { 63 kMethodsMyInnerClassSize) < 0) {
59 jni_generator::HandleRegistrationError( 64 jni_generator::HandleRegistrationError(
60 env, MyInnerClass_clazz(env), __FILE__); 65 env, MyInnerClass_clazz(env), __FILE__);
61 return false; 66 return false;
62 } 67 }
63 68
64 return true; 69 return true;
65 } 70 }
66 71
67 #endif // org_chromium_TestJni_JNI 72 #endif // org_chromium_TestJni_JNI
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698