android/java/src/org/chromium/base/library_loader/ModernLinker.java - Issue 2045303002: Update to Chromium //base at Chromium commit 3e81715e6d3a4324362635aea46ce1f1a163cca1.

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: android/java/src/org/chromium/base/library_loader/ModernLinker.java

Issue 2045303002: Update to Chromium //base at Chromium commit 3e81715e6d3a4324362635aea46ce1f1a163cca1. (Closed) Base URL: https://chromium.googlesource.com/external/github.com/domokit/base@master

Patch Set: Created 4 years, 6 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/java/src/org/chromium/base/library_loader/Linker.java ('k') | android/java/src/org/chromium/base/metrics/RecordHistogram.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android/java/src/org/chromium/base/library_loader/ModernLinker.java

diff --git a/android/java/src/org/chromium/base/library_loader/ModernLinker.java b/android/java/src/org/chromium/base/library_loader/ModernLinker.java

index 9bbdaba781f3f7f856831472d7a3aed0f8d17236..a43777915ace9873c24d26573b70090807d7a51a 100644

--- a/android/java/src/org/chromium/base/library_loader/ModernLinker.java

+++ b/android/java/src/org/chromium/base/library_loader/ModernLinker.java

@@ -370,8 +370,8 @@ class ModernLinker extends Linker {

// file at zip_path. This enables directly loading from APK. We add the

// "crazy." prefix to the path in the zip file to prevent the Android package

// manager from seeing this as a library and so extracting it from the APK.

- String cpu_abi = nativeGetCpuAbi();

- dlopenExtPath = zipFilePath + "!/lib/" + cpu_abi + "/crazy." + libFilePath;

+ String cpuAbi = nativeGetCpuAbi();

+ dlopenExtPath = zipFilePath + "!/lib/" + cpuAbi + "/crazy." + libFilePath;

} else {

// Not loading from APK directly, so simply pass the library name to

// android_dlopen_ext().