summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2015-11-13 16:52:49 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-14 00:54:05 +0000
commit38934c8aa625d980cb5fd890d20b98d103142af2 (patch)
tree36f49e5e433492d715f7f718a19e15a3453c7608
parent0296979a51bf3e6347371c9b3432d7c90f73cec1 (diff)
downloadchromium_src-38934c8aa625d980cb5fd890d20b98d103142af2.zip
chromium_src-38934c8aa625d980cb5fd890d20b98d103142af2.tar.gz
chromium_src-38934c8aa625d980cb5fd890d20b98d103142af2.tar.bz2
[Android] Enable multidex in debug builds of ChromeSyncShell.
BUG= TBR=yfriedman@chromium.org Review URL: https://codereview.chromium.org/1446553004 Cr-Commit-Position: refs/heads/master@{#359706}
-rw-r--r--chrome/android/chrome_apk.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp
index 5f11ad8..b7b31a8 100644
--- a/chrome/android/chrome_apk.gyp
+++ b/chrome/android/chrome_apk.gyp
@@ -240,6 +240,8 @@
'apk_name': 'ChromeSyncShell',
'native_lib_target': 'libchrome_sync_shell',
'java_in_dir': 'java',
+ '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