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

Unified Diff: base/android/java/src/org/chromium/base/multidex/ChromiumMultiDex.java

Issue 1318513003: [Android] Add gyp support for multidex. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add @VisibleForTesting to ChromiumMultiDex.install Created 5 years, 4 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
Index: base/android/java/src/org/chromium/base/multidex/ChromiumMultiDex.java
diff --git a/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDex.java b/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDex.java
new file mode 100644
index 0000000000000000000000000000000000000000..2c28673c89f1d1bb98291178dc146aa1f1276049
--- /dev/null
+++ b/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDex.java
@@ -0,0 +1,58 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.base.multidex;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.Process;
+import android.support.multidex.MultiDex;
+
+import org.chromium.base.Log;
+import org.chromium.base.VisibleForTesting;
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * Performs multidex installation for non-isolated processes.
+ */
+public class ChromiumMultiDex {
+
+ private static final String TAG = "cr.base.multidex";
+
+ /**
+ * Installs secondary dexes if possible.
+ *
+ * Isolated processes (e.g. renderer processes) can't load secondary dex files on
+ * K and below, so we don't even try in that case.
+ *
+ * @param context The application context.
+ */
+ @VisibleForTesting
+ public static void install(Context context) {
+ try {
+ // TODO(jbudorick): Back out this version check once support for K & below works.
+ // http://crbug.com/512357
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP && processIsIsolated()) {
+ Log.i(TAG, "Skipping multidex installation: inside isolated process.");
+ } else {
+ MultiDex.install(context);
+ Log.i(TAG, "Completed multidex installation.");
+ }
+ } catch (NoSuchMethodException e) {
+ Log.wtf(TAG, "Failed multidex installation", e);
+ } catch (IllegalAccessException e) {
+ Log.wtf(TAG, "Failed multidex installation", e);
+ } catch (InvocationTargetException e) {
+ Log.wtf(TAG, "Failed multidex installation", e);
+ }
+ }
+
+ // Calls Process.isIsolated, a private Android API.
+ private static boolean processIsIsolated()
+ throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+ return (boolean) Process.class.getMethod("isIsolated").invoke(null);
+ }
+
+}

Powered by Google App Engine
This is Rietveld 408576698