scripts/slave/recipes/android/android_builder.expected/dartium_builder.json - Issue 59233015: Make gyp target_arch setting native to chromium/config.py

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: scripts/slave/recipes/android/android_builder.expected/dartium_builder.json

Issue 59233015: Make gyp target_arch setting native to chromium/config.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: rebase again Created 7 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 unified diff | Download patch | Annotate | Revision Log

« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipes/android/android_builder.expected/component_builder.json ('k') | scripts/slave/recipes/android/android_builder.expected/klp_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', 'managed': True, 'na me': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"	9 "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'na me': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"

10 ],	10 ],

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
43 "@@@STEP_LOG_LINE@json.output@ \"solutions\": {}@@@",	43 "@@@STEP_LOG_LINE@json.output@ \"solutions\": {}@@@",

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

45 "@@@STEP_LOG_END@json.output@@@"	45 "@@@STEP_LOG_END@json.output@@@"

46 ]	46 ]

47 },	47 },

48 {	48 {

49 "cmd": [	49 "cmd": [

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

51 "--output-json",	51 "--output-json",

52 "/path/to/tmp/json",	52 "/path/to/tmp/json",

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

	54 "--target-arch=x86"

54 ],	55 ],

55 "env": {	56 "env": {

56 "PATH": "[BUILD_INTERNAL]/scripts/slave/android:%(PATH)s"	57 "PATH": "[BUILD_INTERNAL]/scripts/slave/android:%(PATH)s"

57 },	58 },

58 "name": "envsetup",	59 "name": "envsetup",

59 "~followup_annotations": [	60 "~followup_annotations": [

60 "@@@STEP_LOG_LINE@json.output@{@@@",	61 "@@@STEP_LOG_LINE@json.output@{@@@",

61 "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"my_new_gyp_def=aaa\", @ @@",	62 "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"my_new_gyp_def=aaa\", @ @@",

62 "@@@STEP_LOG_LINE@json.output@ \"GYP_SOMETHING\": \"gyp_something_value\" , @@@",	63 "@@@STEP_LOG_LINE@json.output@ \"GYP_SOMETHING\": \"gyp_something_value\" , @@@",

63 "@@@STEP_LOG_LINE@json.output@ \"PATH\": \"./\"@@@",	64 "@@@STEP_LOG_LINE@json.output@ \"PATH\": \"./\"@@@",

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
131 },	132 },

132 {	133 {

133 "always_run": true,	134 "always_run": true,

134 "cmd": [	135 "cmd": [

135 "rm",	136 "rm",

136 "-rf"	137 "-rf"

137 ],	138 ],

138 "name": "cleanup_build"	139 "name": "cleanup_build"

139 }	140 }

140 ]	141 ]

OLD	NEW