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 /chrome/android/chrome_apk.gyp | |
| 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 'chrome/android/chrome_apk.gyp')
| -rw-r--r-- | chrome/android/chrome_apk.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp index e92491d..5f11ad8 100644 --- a/chrome/android/chrome_apk.gyp +++ b/chrome/android/chrome_apk.gyp @@ -200,6 +200,8 @@ 'native_lib_target': 'libchrome_public', 'java_in_dir': 'java', 'resource_dir': '../../chrome/android/java/res_chromium', + 'enable_multidex': 1, + 'enable_multidex_configurations': ['Debug'], 'conditions': [ # Only attempt loading the library from the APK for 64 bit devices # until the number of 32 bit devices which don't support this |