diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-11-12 16:44:58 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-13 00:45:41 +0000 |
| commit | f667d3b3a1b953800bb5325c7b8d62775a1c5aeb (patch) | |
| tree | 2e5615b25b452bc7ec6aa7e39076f8648ec305df /mojo | |
| parent | f7e988ff06ac6ca527bc907410e1f6292534de89 (diff) | |
| download | chromium_src-f667d3b3a1b953800bb5325c7b8d62775a1c5aeb.zip chromium_src-f667d3b3a1b953800bb5325c7b8d62775a1c5aeb.tar.gz chromium_src-f667d3b3a1b953800bb5325c7b8d62775a1c5aeb.tar.bz2 | |
[Android] Enable multidex for debug builds of ChromePublic.
This is a non-incremental implementation. It adds @MainDex to classes used by
the renderer to keep them in the main dex, as it can't load secondary dexes
when using the multidex support library (i.e., on K and below).
BUG=272790
TBR=newt@chromium.org,sky@chromium.org
Review URL: https://codereview.chromium.org/1408163009
Cr-Commit-Position: refs/heads/master@{#359453}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java b/mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java index 52599da..a20ea0a 100644 --- a/mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java +++ b/mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java @@ -6,6 +6,7 @@ package org.chromium.mojo.system.impl; import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.MainDex; import org.chromium.mojo.system.AsyncWaiter; import org.chromium.mojo.system.Core; import org.chromium.mojo.system.DataPipe; @@ -33,6 +34,7 @@ import java.util.List; * Implementation of {@link Core}. */ @JNINamespace("mojo::android") +@MainDex public class CoreImpl implements Core, AsyncWaiter { /** * Discard flag for the |MojoReadData| operation. |