Fix configuration of goma in iOS recipes.

scripts/slave/recipes/ios/try.expected/gyp_goma.json

Index: scripts/slave/recipes/ios/try.expected/gyp_goma.json
diff --git a/scripts/slave/recipes/ios/try.expected/gn.json b/scripts/slave/recipes/ios/try.expected/gyp_goma.json
similarity index 92%
copy from scripts/slave/recipes/ios/try.expected/gn.json
copy to scripts/slave/recipes/ios/try.expected/gyp_goma.json
index f385238ee47a851ff09c13248fcac04b67459d47..314d2db488ccf972625b830cd0590a93d98c5eb0 100644
--- a/scripts/slave/recipes/ios/try.expected/gn.json
+++ b/scripts/slave/recipes/ios/try.expected/gyp_goma.json
@@ -29,7 +29,7 @@
       "--master",
       "tryserver.fake",
       "--builder",
-      "ios-simulator-gn",
+      "ios-simulator",
       "--slave",
       "fake-vm",
       "--spec",
@@ -135,21 +135,22 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/src/ios/build/bots/chromium.mac/ios-simulator-gn.json",
+      "[SLAVE_BUILD]/src/ios/build/bots/chromium.mac/ios-simulator.json",
       "/path/to/tmp/json"
     ],
     "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@    \"OS=ios\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"gomadir=$(goma_dir)\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"target_subarch=both\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"use_goma=1\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  ], @@@",
       "@@@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@    \"use_goma=true\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  ], @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"mb_type\": \"gn\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"gn_args\": [], @@@",
+      "@@@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@    {@@@",
@@ -168,7 +169,7 @@
     "cmd": [
       "echo",
       "-e",
-      "{\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    \"use_goma=true\"\n  ], \n  \"mastername\": \"chromium.mac\", \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  \"use_analyze\": true, \n  \"xcode version\": \"fake xcode version\"\n}"
+      "{\n  \"GYP_DEFINES\": [\n    \"OS=ios\", \n    \"gomadir=$(goma_dir)\", \n    \"target_subarch=both\", \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.mac\", \n  \"mb_type\": \"gyp\", \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_analyze\": true, \n  \"xcode version\": \"fake xcode version\"\n}"
     ],
     "name": "finalize build config"
   },
@@ -187,27 +188,6 @@
     ]
   },
   {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
-      "runhooks"
-    ],
-    "cwd": "[SLAVE_BUILD]/src",
-    "env": {
-      "GYP_CHROMIUM_NO_ACTION": "1",
-      "GYP_CROSSCOMPILE": "1",
-      "GYP_DEFINES": "",
-      "GYP_GENERATORS": "ninja",
-      "LANDMINES_VERBOSE": "1",
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
-    },
-    "name": "gclient runhooks (with patch)",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@<br />GYP_DEFINES:<br /><br />GYP_CHROMIUM_NO_ACTION=1@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "ensure_goma"
   },
@@ -265,12 +245,33 @@
     "cmd": [
       "python",
       "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "runhooks"
+    ],
+    "cwd": "[SLAVE_BUILD]/src",
+    "env": {
+      "GYP_CHROMIUM_NO_ACTION": "1",
+      "GYP_CROSSCOMPILE": "1",
+      "GYP_DEFINES": "OS=ios gomadir=$(goma_dir) target_subarch=both use_goma=1",
+      "GYP_GENERATORS": "ninja",
+      "LANDMINES_VERBOSE": "1",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "gclient runhooks (with patch)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br />GYP_DEFINES:<br />OS=ios<br />gomadir=$(goma_dir)<br />target_subarch=both<br />use_goma=1<br />GYP_CHROMIUM_NO_ACTION=1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "[SLAVE_BUILD]/src/tools/mb/mb.py",
       "gen",
       "-m",
       "chromium.mac",
       "-b",
-      "ios-simulator-gn",
+      "ios-simulator",
       "--config-file",
       "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
       "--goma-dir",
@@ -331,9 +332,9 @@
       "-m",
       "chromium.mac",
       "-b",
-      "ios-simulator-gn",
+      "ios-simulator",
       "-v",
-      "//out/None",
+      "//out/Release",
       "{\"additional_compile_targets\": [\"All\", \"fake tests\"], \"files\": [\"foo.cc\"], \"test_targets\": [\"fake tests\"]}",
       "/path/to/tmp/json"
     ],