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 6665ddfde738544d38fa382a7d0a9da91ede98d0..1838310da9bc61b63f72dc8e606dadf709a32a3d 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 |
@@ -13,6 +13,7 @@ import android.os.Build; |
import android.os.SystemClock; |
import org.chromium.base.CommandLine; |
+import org.chromium.base.ContextUtils; |
import org.chromium.base.Log; |
import org.chromium.base.PackageUtils; |
import org.chromium.base.TraceEvent; |
@@ -388,6 +389,9 @@ public class LibraryLoader { |
// From now on, keep tracing in sync with native. |
TraceEvent.registerNativeEnabledObserver(); |
+ // Ensure that native side application context is loaded and in sync with java side. |
+ ContextUtils.initApplicationContextForNative(); |
+ |
// From this point on, native code is ready to use and checkIsReady() |
// shouldn't complain from now on (and in fact, it's used by the |
// following calls). |