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

Unified Diff: base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java

Issue 1967733002: Break base/ dependency on WebAPKs. (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 | « base/BUILD.gn ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
index f96a78f2ea8897e3d2de8d5cbb9217c85b9c60b0..15eea889087b3eab91a872c6cc3ef33126fb38c4 100644
--- a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
+++ b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
@@ -20,7 +20,6 @@ import org.chromium.base.TraceEvent;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.webapk.lib.common.WebApkUtils;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -273,12 +272,8 @@ public class LibraryLoader {
String zipFilePath = null;
String libFilePath = System.mapLibraryName(library);
if (Linker.isInZipFile()) {
- Context contextForApk =
- (mLibraryProcessType == LibraryProcessType.PROCESS_WEBAPK_CHILD)
- ? WebApkUtils.getHostBrowserContext(context)
- : context;
// Load directly from the APK.
- zipFilePath = getLibraryApkPath(contextForApk);
+ zipFilePath = getLibraryApkPath(context);
Log.i(TAG, "Loading " + library + " from within " + zipFilePath);
} else {
// The library is in its own file.
« no previous file with comments | « base/BUILD.gn ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698