build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.java - Issue 1989203003: Update checks for N+

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: build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.java

Issue 1989203003: Update checks for N+ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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 | « android_webview/java/src/org/chromium/android_webview/AwContents.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.java

diff --git a/build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.java b/build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.java

index ac51be9e9a656ca385fbc987ae8ad7451aaf412a..2253ba1bfe7ddd6da3390beac8c52a2f4e27ec41 100644

--- a/build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.java

+++ b/build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.java

@@ -231,7 +231,8 @@ final class ClassLoaderPatcher {

for (int i = 0; i < files.length; ++i) {

File file = files[i];

Object dexFile;

- if ("N".equals(Build.VERSION.CODENAME)) {

+ if (Build.VERSION.CODENAME.equals("N")

+ || Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {

// loadDexFile requires that ret contain all previously added elements.

dexFile = Reflect.invokeMethod(clazz, "loadDexFile", file, optimizedDirectory,

mClassLoader, ret);