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

Unified Diff: scripts/slave/recipes/webrtc/ios.expected/gn_build.json

Issue 1730353002: WebRTC: Use custom mb_config_path for standalone bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/webrtc/ios.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/webrtc/ios.expected/gn_build.json
diff --git a/scripts/slave/recipes/webrtc/ios.expected/no_tests.json b/scripts/slave/recipes/webrtc/ios.expected/gn_build.json
similarity index 65%
copy from scripts/slave/recipes/webrtc/ios.expected/no_tests.json
copy to scripts/slave/recipes/webrtc/ios.expected/gn_build.json
index 3633d8a6545b09b60fff262deccca643eedf4fd7..732d7f10db4c7cbc0da0983a381028239a041a77 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/no_tests.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/gn_build.json
@@ -72,13 +72,13 @@
"name": "read build config",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"fake gyp define 1\": \"fake value 1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fake gyp define 2\": \"fake value 2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"use_goma\": \"1\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": {}, @@@",
"@@@STEP_LOG_LINE@json.output@ \"compiler\": \"ninja\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gn_args\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"is_debug=true\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ ], @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"mb_type\": \"gn\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"sdk\": \"iphoneos8.0\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tests\": [], @@@",
"@@@STEP_LOG_LINE@json.output@ \"xcode version\": \"fake xcode version\"@@@",
@@ -90,7 +90,7 @@
"cmd": [
"echo",
"-e",
- "{\n \"GYP_DEFINES\": {\n \"OS\": \"ios\", \n \"component\": \"static_library\", \n \"fake gyp define 1\": \"fake value 1\", \n \"fake gyp define 2\": \"fake value 2\", \n \"use_goma\": \"1\"\n }, \n \"additional_compile_targets\": [\n \"All\"\n ], \n \"compiler\": \"ninja\", \n \"configuration\": \"Release\", \n \"env\": {}, \n \"gn_args\": [], \n \"mb_type\": null, \n \"sdk\": \"iphoneos8.0\", \n \"tests\": [], \n \"triggered bots\": {}, \n \"use_analyze\": true, \n \"xcode version\": \"fake xcode version\"\n}"
+ "{\n \"GYP_DEFINES\": {\n \"OS\": \"ios\", \n \"component\": \"static_library\"\n }, \n \"additional_compile_targets\": [\n \"All\"\n ], \n \"compiler\": \"ninja\", \n \"configuration\": \"Debug\", \n \"env\": {}, \n \"gn_args\": [\n \"is_debug=true\"\n ], \n \"mb_type\": \"gn\", \n \"sdk\": \"iphoneos8.0\", \n \"tests\": [], \n \"triggered bots\": {}, \n \"use_analyze\": true, \n \"xcode version\": \"fake xcode version\"\n}"
],
"cwd": "[SLAVE_BUILD]",
"name": "finalize build config"
@@ -119,63 +119,45 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
+ "GYP_CHROMIUM_NO_ACTION": "1",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "use_goma=1 fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios",
+ "GYP_DEFINES": "component=static_library OS=ios",
"GYP_GENERATORS": "ninja",
"LANDMINES_VERBOSE": "1",
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "gclient runhooks",
"~followup_annotations": [
- "@@@STEP_TEXT@<br />GYP_DEFINES:<br />use_goma=1<br />fake gyp define 1=fake value 1<br />fake gyp define 2=fake value 2<br />component=static_library<br />OS=ios@@@"
+ "@@@STEP_TEXT@<br />GYP_DEFINES:<br />component=static_library<br />OS=ios<br />GYP_CHROMIUM_NO_ACTION=1@@@"
]
},
{
- "allow_subannotations": true,
"cmd": [
"python",
"-u",
- "[BUILD]/scripts/slave/clang_revision.py",
- "--src-dir",
- "[SLAVE_BUILD]/src",
- "--output-json",
- "/path/to/tmp/json"
+ "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "gen",
+ "-m",
+ "chromium.fake",
+ "-b",
+ "ios",
+ "--config-file",
+ "[SLAVE_BUILD]/src/webrtc/build/mb_config.pyl",
+ "--goma-dir",
+ "[BUILD]/goma",
+ "//out/Debug-iphoneos"
],
"cwd": "[SLAVE_BUILD]",
- "name": "clang_revision",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
+ "name": "generate_build_files"
},
{
"cmd": [
- "python",
- "-u",
- "[BUILD]/scripts/slave/compile.py",
- "--target",
- "Release-iphoneos",
- "--src-dir",
- "[SLAVE_BUILD]/src",
- "--build-tool",
"ninja",
- "--compiler",
- "goma-clang",
- "--goma-jsonstatus",
- "/path/to/tmp/json",
- "--goma-dir",
- "[BUILD]/goma",
- "--",
- "All"
+ "-C",
+ "[SLAVE_BUILD]/src/out/Debug-iphoneos"
],
- "cwd": "[SLAVE_BUILD]/src/out/Release-iphoneos",
- "name": "compile",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
- "@@@STEP_LOG_END@json.output (invalid)@@@"
- ]
+ "cwd": "[SLAVE_BUILD]/src/out/Debug-iphoneos",
+ "name": "compile"
},
{
"name": "$result",
« no previous file with comments | « scripts/slave/recipes/webrtc/ios.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698