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

Unified Diff: build/android/gyp/write_build_config.py

Issue 1471393002: GN Incremental Install: Don't use proguarded dex when is_debug = false (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add warning 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
« no previous file with comments | « no previous file | build/android/incremental_install/create_install_script.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/write_build_config.py
diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py
index 625107f5dcdc643fcd8abc8e9242080eb545c223..b8b8ec8c748827569799b6c63ef4e11078b4168a 100755
--- a/build/android/gyp/write_build_config.py
+++ b/build/android/gyp/write_build_config.py
@@ -395,10 +395,6 @@ def main(argv):
if options.type in ['android_apk', 'deps_dex']:
config['final_dex'] = {}
dex_config = config['final_dex']
- if proguard_enabled:
- # When proguard is enabled, the proguarded jar contains the code for all
- # of the dependencies.
- deps_dex_files = []
dex_config['dependency_dex_files'] = deps_dex_files
if options.type == 'android_apk':
« no previous file with comments | « no previous file | build/android/incremental_install/create_install_script.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698