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

Unified Diff: build/android/apkbuilder_action.gypi

Issue 1318513003: [Android] Add gyp support for multidex. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add @VisibleForTesting to ChromiumMultiDex.install Created 5 years, 4 months 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
« no previous file with comments | « build/android/ant/apk-package.xml ('k') | build/android/gyp/dex.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/apkbuilder_action.gypi
diff --git a/build/android/apkbuilder_action.gypi b/build/android/apkbuilder_action.gypi
index 27807d861fbff4b508bd921e705236487a0ed128..e073e9bdbec688cd0517c8b0732b1af961296e76 100644
--- a/build/android/apkbuilder_action.gypi
+++ b/build/android/apkbuilder_action.gypi
@@ -56,6 +56,11 @@
'-DDEX_FILE_PATH=<(dex_path)',
]
}],
+ ['enable_multidex == 1', {
+ 'action': [
+ '-DMULTIDEX_ENABLED=1',
+ ]
+ }]
],
'action': [
'python', '<(DEPTH)/build/android/gyp/ant.py',
« no previous file with comments | « build/android/ant/apk-package.xml ('k') | build/android/gyp/dex.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698