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

Unified Diff: build/android/main_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/main_dex_action.gypi
diff --git a/build/android/main_dex_action.gypi b/build/android/main_dex_action.gypi
index 06717ddcff61033f445597296aca597126ba2f36..7316ae20e9da08ba3025a693ffcb766e70e212b0 100644
--- a/build/android/main_dex_action.gypi
+++ b/build/android/main_dex_action.gypi
@@ -21,7 +21,7 @@
{
'message': 'Generating main dex classes list for <(jar_path)',
'variables': {
- 'jar_path%': '',
+ 'jar_paths%': [],
'output_path%': '',
'main_dex_list_script': '<(DEPTH)/build/android/gyp/main_dex_list.py',
'main_dex_rules_path': '<(DEPTH)/build/android/main_dex_classes.flags',
@@ -30,6 +30,7 @@
'<(jar_path)',
'<(main_dex_list_script)',
'<(main_dex_rules_path)',
+ '<(multidex_configuration_path)',
],
'outputs': [
'<(output_path)',
@@ -39,6 +40,7 @@
'--main-dex-list-path', '<(output_path)',
'--android-sdk-tools', '<(android_sdk_tools)',
'--main-dex-rules-path', '<(main_dex_rules_path)',
- '<(jar_path)',
+ '--multidex-configuration-path', '<(multidex_configuration_path)',
+ '<@(jar_paths)',
]
}

Powered by Google App Engine
This is Rietveld 408576698