Index: scripts/slave/recipes/ios/try.expected/gn.json |
diff --git a/scripts/slave/recipes/ios/try.expected/gn.json b/scripts/slave/recipes/ios/try.expected/gn.json |
index d8a7243aef7ab360b784377e8fa32cd7679389b8..96d7b46f9a66045c0b6afd98e32259835318d5fa 100644 |
--- a/scripts/slave/recipes/ios/try.expected/gn.json |
+++ b/scripts/slave/recipes/ios/try.expected/gn.json |
@@ -131,6 +131,8 @@ |
"@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": {}, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"compiler\": \"ninja\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"gn_args\": \"target_os=\\\"ios\\\" ios_enable_code_signing=false\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"mb_type\": \"gn\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"sdk\": \"iphonesimulator8.0\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"tests\": [@@@", |
"@@@STEP_LOG_LINE@json.output@ {@@@", |
@@ -139,7 +141,6 @@ |
"@@@STEP_LOG_LINE@json.output@ \"os\": \"8.1\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }@@@", |
"@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"use_mb\": true, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"xcode version\": \"fake xcode version\"@@@", |
"@@@STEP_LOG_LINE@json.output@}@@@", |
"@@@STEP_LOG_END@json.output@@@" |
@@ -149,7 +150,7 @@ |
"cmd": [ |
"echo", |
"-e", |
- "{\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 \"sdk\": \"iphonesimulator8.0\", \n \"tests\": [\n {\n \"app\": \"fake tests\", \n \"device type\": \"fake device\", \n \"os\": \"8.1\"\n }\n ], \n \"triggered bots\": {}, \n \"use_mb\": true, \n \"xcode version\": \"fake xcode version\"\n}" |
+ "{\n \"GYP_DEFINES\": {}, \n \"additional_compile_targets\": [\n \"All\"\n ], \n \"compiler\": \"ninja\", \n \"configuration\": \"Debug\", \n \"env\": {}, \n \"gn_args\": \"target_os=\\\"ios\\\" ios_enable_code_signing=false\", \n \"mb_type\": \"gn\", \n \"sdk\": \"iphonesimulator8.0\", \n \"tests\": [\n {\n \"app\": \"fake tests\", \n \"device type\": \"fake device\", \n \"os\": \"8.1\"\n }\n ], \n \"triggered bots\": {}, \n \"xcode version\": \"fake xcode version\"\n}" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "finalize build config" |
@@ -178,15 +179,16 @@ |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
+ "GN_ARGS": "target_os=\"ios\" ios_enable_code_signing=false", |
"GYP_CHROMIUM_NO_ACTION": "1", |
"GYP_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "component=static_library OS=ios", |
"GYP_GENERATORS": "ninja", |
- "LANDMINES_VERBOSE": "1" |
+ "LANDMINES_VERBOSE": "1", |
+ "MB_TYPE": "gn" |
}, |
"name": "gclient runhooks (with patch)", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@<br />GYP_DEFINES:<br />component=static_library<br />OS=ios@@@" |
+ "@@@STEP_TEXT@<br />gn args:<br />target_os=\"ios\" ios_enable_code_signing=false@@@" |
] |
}, |
{ |