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

Unified Diff: components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java

Issue 2020373002: [Cronet] Call System.loadLibrary() from impl not API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@implpack
Patch Set: sync Created 4 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 | « components/cronet/android/api/src/org/chromium/net/CronetEngine.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java
diff --git a/components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java b/components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java
index 082fe503dcab718f7d25e3dec736d5a305f4a58b..78579af07805ee6b400a29a494b1abf84a76b1b3 100644
--- a/components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java
+++ b/components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java
@@ -41,7 +41,11 @@ public class CronetLibraryLoader {
}
sInitStarted = true;
ContextUtils.initApplicationContext(context.getApplicationContext());
- builder.loadLibrary();
+ if (builder.libraryLoader() != null) {
+ builder.libraryLoader().loadLibrary(builder.libraryName());
+ } else {
+ System.loadLibrary(builder.libraryName());
+ }
ContextUtils.initApplicationContextForNative();
if (!ImplVersion.CRONET_VERSION.equals(nativeGetCronetVersion())) {
throw new RuntimeException(String.format("Expected Cronet version number %s, "
« no previous file with comments | « components/cronet/android/api/src/org/chromium/net/CronetEngine.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698