base/android/jni_generator/testMultipleJNIAdditionalImport.golden - Issue 2213963002: Stop relying on using statements in the JNI generator.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2213963002: Stop relying on using statements in the JNI generator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « base/android/jni_generator/testInnerClassNativesMultiple.golden ('k') | base/android/jni_generator/testNativeExportsOnlyOption.golden » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/android/jni_generator/testMultipleJNIAdditionalImport.golden

diff --git a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden

index 616af71702cbf3942216836e449fcb26a1fde6b1..48c1616b6c1c6124c50d84386d1b5325b82f1a86 100644

--- a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden

+++ b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden

@@ -27,17 +27,18 @@ base::subtle::AtomicWord g_Foo_clazz __attribute__((unused)) = 0;

// Step 2: method stubs.

-static void DoSomething(JNIEnv* env, const JavaParamRef<jclass>& jcaller,

- const JavaParamRef<jobject>& callback1,

- const JavaParamRef<jobject>& callback2);

+static void DoSomething(JNIEnv* env, const base::android::JavaParamRef<jclass>&

+ jcaller,

+ const base::android::JavaParamRef<jobject>& callback1,

+ const base::android::JavaParamRef<jobject>& callback2);

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),

- JavaParamRef<jobject>(env, callback1), JavaParamRef<jobject>(env,

- callback2));

+ return DoSomething(env, base::android::JavaParamRef<jclass>(env, jcaller),

+ base::android::JavaParamRef<jobject>(env, callback1),

+ base::android::JavaParamRef<jobject>(env, callback2));

}

static base::subtle::AtomicWord g_Foo_calledByNative = 0;