content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java - Issue 1263053002: Move JNI annotations to annotations package.

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: content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java

Issue 1263053002: Move JNI annotations to annotations package. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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 | « content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java ('k') | device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java

diff --git a/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java

index 0ca4e494c591c02c6224571a5b57672740656a35..da6cdec73260d5a9bf5e6defd1980067604b793c 100644

--- a/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java

+++ b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java

@@ -6,7 +6,7 @@ package org.chromium.chromium_linker_test_apk;

import android.util.Log;

-import org.chromium.base.JNINamespace;

+import org.chromium.base.annotations.JNINamespace;

import org.chromium.base.library_loader.Linker;

/**

@@ -47,10 +47,11 @@ public class LinkerTests implements Linker.TestRunner {

checkSharedRelro = true;

}

- if (checkSharedRelro)

+ if (checkSharedRelro) {

return nativeCheckForSharedRelros(isBrowserProcess);

- else

+ } else {

return nativeCheckForNoSharedRelros(isBrowserProcess);

+ }

}

// Check that there are shared RELRO sections in the current process,