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

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

Issue 2237793002: WebRTC: Add gyp_script parameter to ios recipe module's run_mb call. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Updated last expectation Created 4 years, 4 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') | scripts/slave/recipes/webrtc/ios.expected/gn_build.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/webrtc/ios.expected/basic.json
diff --git a/scripts/slave/recipes/webrtc/ios.expected/basic.json b/scripts/slave/recipes/webrtc/ios.expected/basic.json
index 44d9f075e4b684f64d10df79675f2fca0301fc76..5109802f364c70fa5477f96a74a255c68cf7e2f5 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/basic.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/basic.json
@@ -119,6 +119,7 @@
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"compiler\": \"ninja\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"mb_type\": \"gyp\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"sdk\": \"iphonesimulator8.0\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
@@ -141,7 +142,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\": \"Debug\", \n \"env\": {}, \n \"gn_args\": [], \n \"mastername\": \"chromium.fake\", \n \"mb_type\": null, \n \"sdk\": \"iphonesimulator8.0\", \n \"tests\": [\n {\n \"app\": \"fake tests 1\", \n \"device type\": \"fake device\", \n \"id\": \"0\", \n \"os\": \"8.0\"\n }, \n {\n \"app\": \"fake tests 2\", \n \"device type\": \"fake device\", \n \"id\": \"1\", \n \"os\": \"7.1\"\n }\n ], \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 \"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\": \"Debug\", \n \"env\": {}, \n \"gn_args\": [], \n \"mastername\": \"chromium.fake\", \n \"mb_type\": \"gyp\", \n \"sdk\": \"iphonesimulator8.0\", \n \"tests\": [\n {\n \"app\": \"fake tests 1\", \n \"device type\": \"fake device\", \n \"id\": \"0\", \n \"os\": \"8.0\"\n }, \n {\n \"app\": \"fake tests 2\", \n \"device type\": \"fake device\", \n \"id\": \"1\", \n \"os\": \"7.1\"\n }\n ], \n \"triggered bots\": {}, \n \"use_analyze\": true, \n \"xcode version\": \"fake xcode version\"\n}"
],
"name": "finalize build config"
},
@@ -222,6 +223,7 @@
],
"cwd": "[BUILDER_CACHE]/ios_debug/src",
"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_GENERATORS": "ninja",
@@ -230,10 +232,33 @@
},
"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 />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<br />GYP_CHROMIUM_NO_ACTION=1@@@"
]
},
{
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILDER_CACHE]/ios_debug/src/tools/mb/mb.py",
+ "gen",
+ "-m",
+ "chromium.fake",
+ "-b",
+ "ios debug",
+ "--config-file",
+ "[BUILDER_CACHE]/ios_debug/src/webrtc/build/mb_config.pyl",
+ "--goma-dir",
+ "[CACHE]/cipd/goma",
+ "--gyp-script=[BUILDER_CACHE]/ios_debug/src/webrtc/build/gyp_webrtc.py",
+ "//out/Debug-iphonesimulator"
+ ],
+ "cwd": "[BUILDER_CACHE]/ios_debug/src",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "generate_build_files"
+ },
+ {
"allow_subannotations": true,
"cmd": [
"python",
« no previous file with comments | « scripts/slave/recipes/webrtc/ios.py ('k') | scripts/slave/recipes/webrtc/ios.expected/gn_build.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698