Chromium Code Reviews| 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()); |
|
kapishnikov
2016/06/02 16:33:38
If the client passes the custom library loader but
pauljensen
2016/07/22 14:18:04
Ya, we'll probably want to @hide CronetEngine.setL
pauljensen
2016/07/22 14:18:42
I should mention I added this to my TODO list for
|
| + } else { |
| + System.loadLibrary(builder.libraryName()); |
| + } |
| ContextUtils.initApplicationContextForNative(); |
| if (!ImplVersion.CRONET_VERSION.equals(nativeGetCronetVersion())) { |
| throw new RuntimeException(String.format("Expected Cronet version number %s, " |