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

Side by Side Diff: build/android/dex_action.gypi

Issue 185563012: Revert of android: Make dex_action.gypi not call md5sum. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | build/android/gyp/dex.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 an action to provide a rule that dexes 5 # This file is meant to be included into an action to provide a rule that dexes
6 # compiled java files. If proguard_enabled == "true" and CONFIGURATION_NAME == 6 # compiled java files. If proguard_enabled == "true" and CONFIGURATION_NAME ==
7 # "Release", then it will dex the proguard_enabled_input_path instead of the 7 # "Release", then it will dex the proguard_enabled_input_path instead of the
8 # normal dex_input_paths/dex_generated_input_paths. 8 # normal dex_input_paths/dex_generated_input_paths.
9 # 9 #
10 # To use this, create a gyp target with the following form: 10 # To use this, create a gyp target with the following form:
11 # { 11 # {
12 # 'action_name': 'some name for the action' 12 # 'action_name': 'some name for the action'
13 # 'actions': [ 13 # 'actions': [
14 # 'variables': { 14 # 'variables': {
15 # 'dex_input_paths': [ 'files to dex (when proguard is not used) and add to input paths' ], 15 # 'dex_input_paths': [ 'files to dex (when proguard is not used) and add to input paths' ],
16 # 'dex_generated_input_dirs': [ 'dirs that contain generated files to dex ' ], 16 # 'dex_generated_input_dirs': [ 'dirs that contain generated files to dex ' ],
17 # 'input_paths': [ 'additional files to be added to the list of inputs' ] ,
17 # 18 #
18 # # For targets that use proguard: 19 # # For targets that use proguard:
19 # 'proguard_enabled': 'true', 20 # 'proguard_enabled': 'true',
20 # 'proguard_enabled_input_path': 'path to dex when using proguard', 21 # 'proguard_enabled_input_path': 'path to dex when using proguard',
21 # }, 22 # },
22 # 'includes': [ 'relative/path/to/dex_action.gypi' ], 23 # 'includes': [ 'relative/path/to/dex_action.gypi' ],
23 # ], 24 # ],
24 # }, 25 # },
25 # 26 #
26 27
27 { 28 {
28 'message': 'Creating dex file: <(output_path)', 29 'message': 'Creating dex file: <(output_path)',
29 'variables': { 30 'variables': {
30 'dex_input_paths': [], 31 'dex_input_paths': [],
31 'dex_generated_input_dirs': [], 32 'dex_generated_input_dirs': [],
33 'input_paths': [],
32 'proguard_enabled%': 'false', 34 'proguard_enabled%': 'false',
33 'proguard_enabled_input_path%': '', 35 'proguard_enabled_input_path%': '',
34 'dex_no_locals%': 0, 36 'dex_no_locals%': 0,
35 }, 37 },
36 'inputs': [ 38 'inputs': [
37 '<(DEPTH)/build/android/gyp/util/build_utils.py', 39 '<(DEPTH)/build/android/gyp/util/build_utils.py',
38 '<(DEPTH)/build/android/gyp/util/md5_check.py', 40 '<(DEPTH)/build/android/gyp/util/md5_check.py',
39 '<(DEPTH)/build/android/gyp/dex.py', 41 '<(DEPTH)/build/android/gyp/dex.py',
42 '>@(input_paths)',
40 '>@(dex_input_paths)', 43 '>@(dex_input_paths)',
41 ], 44 ],
42 'outputs': [ 45 'outputs': [
43 '<(output_path)', 46 '<(output_path)',
44 ], 47 ],
45 'action': [ 48 'action': [
46 'python', '<(DEPTH)/build/android/gyp/dex.py', 49 'python', '<(DEPTH)/build/android/gyp/dex.py',
47 '--dex-path=<(output_path)', 50 '--dex-path=<(output_path)',
48 '--android-sdk-tools=<(android_sdk_tools)', 51 '--android-sdk-tools=<(android_sdk_tools)',
49 '--configuration-name=<(CONFIGURATION_NAME)', 52 '--configuration-name=<(CONFIGURATION_NAME)',
50 '--proguard-enabled=<(proguard_enabled)', 53 '--proguard-enabled=<(proguard_enabled)',
51 '--proguard-enabled-input-path=<(proguard_enabled_input_path)', 54 '--proguard-enabled-input-path=<(proguard_enabled_input_path)',
52 '--no-locals=<(dex_no_locals)', 55 '--no-locals=<(dex_no_locals)',
56
57 # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
58 '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
59
53 '>@(dex_input_paths)', 60 '>@(dex_input_paths)',
54 '>@(dex_generated_input_dirs)', 61 '>@(dex_generated_input_dirs)',
55 ] 62 ]
56 } 63 }
OLDNEW
« no previous file with comments | « no previous file | build/android/gyp/dex.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698