| 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 764b268ed6c1f5642bd4016c219e429a40be12be..06a2795848ebc479a1e328e5c61ee834b40f2702 100644
|
| --- a/scripts/slave/recipes/ios/try.expected/gn.json
|
| +++ b/scripts/slave/recipes/ios/try.expected/gn.json
|
| @@ -128,9 +128,14 @@
|
| "name": "read build config",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": {}, @@@",
|
| + "@@@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\": [@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"target_os=\\\"ios\\\"\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"ios_enable_code_signing=false\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| + "@@@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 +144,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 +153,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\": [\n \"target_os=\\\"ios\\\"\", \n \"ios_enable_code_signing=false\"\n ], \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"
|
| @@ -180,13 +184,13 @@
|
| "env": {
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_CROSSCOMPILE": "1",
|
| - "GYP_DEFINES": "component=static_library OS=ios",
|
| + "GYP_DEFINES": "",
|
| "GYP_GENERATORS": "ninja",
|
| "LANDMINES_VERBOSE": "1"
|
| },
|
| "name": "gclient runhooks (with patch)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@<br />GYP_DEFINES:<br />component=static_library<br />OS=ios@@@"
|
| + "@@@STEP_TEXT@<br />GYP_DEFINES:<br /><br />GYP_CHROMIUM_NO_ACTION=1@@@"
|
| ]
|
| },
|
| {
|
|
|