build/scripts/slave/recipes/android/android_builder.expected/component_builder.json - Issue 170783015: recipes: Stop passing --target-arch to envsetup now that it's ignored.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: build/scripts/slave/recipes/android/android_builder.expected/component_builder.json

Issue 170783015: recipes: Stop passing --target-arch to envsetup now that it's ignored. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/

Patch Set: Created 6 years, 10 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

« build/scripts/slave/recipe_modules/chromium_android/api.py ('K') | « build/scripts/slave/recipes/android/android_builder.expected/clang_builder.json ('k') | build/scripts/slave/recipes/android/android_builder.expected/dartium_builder.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 [	1 [

2 {	2 {

3 "cmd": [	3 "cmd": [

4 "python",	4 "python",

5 "-u",	5 "-u",

6 "[DEPOT_TOOLS]/gclient.py",	6 "[DEPOT_TOOLS]/gclient.py",

7 "config",	7 "config",

8 "--spec",	8 "--spec",

9 "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True , 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget _os = ['android']"	9 "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True , 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget _os = ['android']"

10 ],	10 ],

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
72 "@@@STEP_LOG_LINE@json.output@ \"SCREENSHOT_BUCKET\": \"screenshot-archiv e\"@@@",	72 "@@@STEP_LOG_LINE@json.output@ \"SCREENSHOT_BUCKET\": \"screenshot-archiv e\"@@@",

73 "@@@STEP_LOG_LINE@json.output@}@@@",	73 "@@@STEP_LOG_LINE@json.output@}@@@",

74 "@@@STEP_LOG_END@json.output@@@"	74 "@@@STEP_LOG_END@json.output@@@"

75 ]	75 ]

76 },	76 },

77 {	77 {

78 "cmd": [	78 "cmd": [

79 "[BUILD]/scripts/slave/env_dump.py",	79 "[BUILD]/scripts/slave/env_dump.py",

80 "--output-json",	80 "--output-json",

81 "/path/to/tmp/json",	81 "/path/to/tmp/json",

82 "[SLAVE_BUILD]/src/build/android/envsetup.sh",	82 "[SLAVE_BUILD]/src/build/android/envsetup.sh"

83 "--target-arch=arm"

84 ],	83 ],

85 "env": {	84 "env": {

86 "PATH": "[BUILD_INTERNAL]/scripts/slave/android:%(PATH)s"	85 "PATH": "[BUILD_INTERNAL]/scripts/slave/android:%(PATH)s"

87 },	86 },

88 "name": "envsetup",	87 "name": "envsetup",

89 "~followup_annotations": [	88 "~followup_annotations": [

90 "@@@STEP_LOG_LINE@json.output@{@@@",	89 "@@@STEP_LOG_LINE@json.output@{@@@",

91 "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"my_new_gyp_def=aaa\", @ @@",	90 "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"my_new_gyp_def=aaa\", @ @@",

92 "@@@STEP_LOG_LINE@json.output@ \"GYP_SOMETHING\": \"gyp_something_value\" , @@@",	91 "@@@STEP_LOG_LINE@json.output@ \"GYP_SOMETHING\": \"gyp_something_value\" , @@@",

93 "@@@STEP_LOG_LINE@json.output@ \"PATH\": \"./\"@@@",	92 "@@@STEP_LOG_LINE@json.output@ \"PATH\": \"./\"@@@",

(...skipping 96 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
190 {	189 {

191 "always_run": true,	190 "always_run": true,

192 "cmd": [	191 "cmd": [

193 "rm",	192 "rm",

194 "-rf",	193 "-rf",

195 "[SLAVE_BUILD]/src/out/build_product_4f4b02f6b7fa20a3a25682c457bbc8ad589c8 a00.zip"	194 "[SLAVE_BUILD]/src/out/build_product_4f4b02f6b7fa20a3a25682c457bbc8ad589c8 a00.zip"

196 ],	195 ],

197 "name": "cleanup_build"	196 "name": "cleanup_build"

198 }	197 }

199 ]	198 ]

OLD	NEW