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

Side by Side Diff: build/scripts/slave/recipes/webrtc_android_apk_trybot.expected/Debug_arm.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
OLDNEW
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 = [{'custom_deps': {'src/third_party/WebKit/L ayoutTests': None, 'src/third_party/webrtc': 'http://webrtc.googlecode.com/svn/t runk/webrtc@12345', 'src/webkit/data/layout_tests/LayoutTests': None}, 'custom_v ars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'sv n://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.go lo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'sr c', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'svn://svn-mirror.gol o.chromium.org/chrome-internal/trunk/webrtc-limited'}, {'deps_file': 'DEPS', 'ma naged': True, 'name': 'webrtc.DEPS', 'url': 'svn://svn-mirror.golo.chromium.org/ chrome/trunk/deps/third_party/webrtc/webrtc.DEPS'}]\ntarget_os = ['android']" 9 "cache_dir = None\nsolutions = [{'custom_deps': {'src/third_party/WebKit/L ayoutTests': None, 'src/third_party/webrtc': 'http://webrtc.googlecode.com/svn/t runk/webrtc@12345', 'src/webkit/data/layout_tests/LayoutTests': None}, 'custom_v ars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'sv n://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.go lo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'sr c', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'svn://svn-mirror.gol o.chromium.org/chrome-internal/trunk/webrtc-limited'}, {'deps_file': 'DEPS', 'ma naged': True, 'name': 'webrtc.DEPS', 'url': 'svn://svn-mirror.golo.chromium.org/ chrome/trunk/deps/third_party/webrtc/webrtc.DEPS'}]\ntarget_os = ['android']"
10 ], 10 ],
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 "--path-filter", 90 "--path-filter",
91 "webrtc/" 91 "webrtc/"
92 ], 92 ],
93 "name": "apply_patch" 93 "name": "apply_patch"
94 }, 94 },
95 { 95 {
96 "cmd": [ 96 "cmd": [
97 "[BUILD]/scripts/slave/env_dump.py", 97 "[BUILD]/scripts/slave/env_dump.py",
98 "--output-json", 98 "--output-json",
99 "/path/to/tmp/json", 99 "/path/to/tmp/json",
100 "[SLAVE_BUILD]/src/build/android/envsetup.sh", 100 "[SLAVE_BUILD]/src/build/android/envsetup.sh"
101 "--target-arch=arm"
102 ], 101 ],
103 "name": "envsetup", 102 "name": "envsetup",
104 "~followup_annotations": [ 103 "~followup_annotations": [
105 "@@@STEP_LOG_LINE@json.output@{@@@", 104 "@@@STEP_LOG_LINE@json.output@{@@@",
106 "@@@STEP_LOG_LINE@json.output@ \"FOO\": \"bar\", @@@", 105 "@@@STEP_LOG_LINE@json.output@ \"FOO\": \"bar\", @@@",
107 "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"my_new_gyp_def=aaa\"@@@ ", 106 "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"my_new_gyp_def=aaa\"@@@ ",
108 "@@@STEP_LOG_LINE@json.output@}@@@", 107 "@@@STEP_LOG_LINE@json.output@}@@@",
109 "@@@STEP_LOG_END@json.output@@@" 108 "@@@STEP_LOG_END@json.output@@@"
110 ] 109 ]
111 }, 110 },
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 ], 350 ],
352 "env": { 351 "env": {
353 "FOO": "bar", 352 "FOO": "bar",
354 "GYP_CROSSCOMPILE": "1", 353 "GYP_CROSSCOMPILE": "1",
355 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[B UILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1", 354 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[B UILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
356 "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc" 355 "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
357 }, 356 },
358 "name": "voice_engine_unittests" 357 "name": "voice_engine_unittests"
359 } 358 }
360 ] 359 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698