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

Unified Diff: build/android/dex_action.gypi

Issue 1408163009: [Android] Enable multidex for debug builds of ChromePublic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no-op ChromiumMultiDex.install for non-multidex builds Created 5 years, 1 month 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: build/android/dex_action.gypi
diff --git a/build/android/dex_action.gypi b/build/android/dex_action.gypi
index 7d9638e035c25e046ee9193ae256daef90f6454d..9bf6804d4368c81845a5523cc6c682d3e8503409 100644
--- a/build/android/dex_action.gypi
+++ b/build/android/dex_action.gypi
@@ -35,6 +35,7 @@
'proguard_enabled_input_path%': '',
'dex_no_locals%': 0,
'dex_additional_options': [],
+ 'multidex_configuration_path%': '',
},
'inputs': [
'<(DEPTH)/build/android/gyp/util/build_utils.py',
@@ -56,6 +57,7 @@
'--debug-build-proguard-enabled=>(debug_build_proguard_enabled)',
'--proguard-enabled-input-path=<(proguard_enabled_input_path)',
'--no-locals=>(dex_no_locals)',
+ '--multidex-configuration-path=<(multidex_configuration_path)',
'>@(dex_additional_options)',
'>@(dex_input_paths)',
'>@(dex_generated_input_dirs)',

Powered by Google App Engine
This is Rietveld 408576698