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

Side by Side Diff: build/java_apk.gypi

Issue 13145006: Fix proguard enabled condition in dexing step. By definition proguard_enabled flag should use "true… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # This file is meant to be included into a target to provide a rule 5 # This file is meant to be included into a target to provide a rule
6 # to build Android APKs in a consistent manner. 6 # to build Android APKs in a consistent manner.
7 # 7 #
8 # To use this, create a gyp target with the following form: 8 # To use this, create a gyp target with the following form:
9 # { 9 # {
10 # 'target_name': 'my_package_apk', 10 # 'target_name': 'my_package_apk',
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 # (e.g. if a Java file is removed), the command will be re-run. 301 # (e.g. if a Java file is removed), the command will be re-run.
302 # TODO(newt): remove this once crbug.com/177552 is fixed in ninja. 302 # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
303 '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)', 303 '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
304 ], 304 ],
305 }, 305 },
306 { 306 {
307 'action_name': 'dex_<(_target_name)', 307 'action_name': 'dex_<(_target_name)',
308 'message': 'Dexing <(_target_name) jar', 308 'message': 'Dexing <(_target_name) jar',
309 'variables': { 309 'variables': {
310 'conditions': [ 310 'conditions': [
311 ['proguard_enabled==1', { 311 ['proguard_enabled=="true" and CONFIGURATION_NAME=="Release"', {
312 'dex_inputs': [ '<(obfuscated_jar_path)' ], 312 'dex_inputs': [ '<(obfuscated_jar_path)' ],
313 'dex_generated_inputs': [], 313 'dex_generated_inputs': [],
314 }, { 314 }, {
315 'dex_inputs': [ 315 'dex_inputs': [
316 '>@(library_dexed_jars_paths)', 316 '>@(library_dexed_jars_paths)',
317 ], 317 ],
318 'dex_generated_inputs': [ 318 'dex_generated_inputs': [
319 '<(classes_dir)', 319 '<(classes_dir)',
320 ], 320 ],
321 }], 321 }],
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 389
390 # Add list of inputs to the command line, so if inputs change 390 # Add list of inputs to the command line, so if inputs change
391 # (e.g. if a Java file is removed), the command will be re-run. 391 # (e.g. if a Java file is removed), the command will be re-run.
392 # TODO(newt): remove this once crbug.com/177552 is fixed in ninja. 392 # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
393 '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)', 393 '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
394 394
395 ] 395 ]
396 }, 396 },
397 ], 397 ],
398 } 398 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698