[ios] Roll chromium.mac/ios* to Xcode 10 beta 6.

Bug: 843244
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ie47a226f37869f26b99b35f6cb2fedb194f53ae1
Reviewed-on: https://chromium-review.googlesource.com/1181461Reviewed-by: Justin Cohen <justincohen@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584527}

infra/config/global/cr-buildbucket.cfg

@@ -388,19 +388,10 @@ builder_mixins {
 
 builder_mixins {
   name: "xcode-caches"
-  caches: {
-    # Cache for Xcode 10.0 beta 5 (build version 10l221o) needed for iOS builds.
-    name: "xcode_ios_10l221o"
-    path: "xcode_ios_10l221o.app"
-  }
-}
-
-builder_mixins {
-  name: "xcode-10-try-caches"
   caches: {
     # Cache for Xcode 10.0 beta 6 (build version 10l232m) needed for iOS builds.
     name: "xcode_ios_10l232m"
-    path: "xcode_ios_10l221m.app"
+    path: "xcode_ios_10l232m.app"
   }
 }
 
@@ -1355,9 +1346,9 @@ buckets {
     builders { mixins: "ios-ci" name: "ios-simulator-xcode-clang" }
     builders { mixins: "ios-ci" name: "ios-uirefresh-simulator" }
     builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios-simulator-cronet" }
-    builders { mixins: "ios-ci" mixins: "fyi-ci" mixins: "xcode-10-try-caches" name: "ios12-sdk-device" }
-    builders { mixins: "ios-ci" mixins: "fyi-ci" mixins: "xcode-10-try-caches" name: "ios12-sdk-simulator" }
-    builders { mixins: "ios-ci" mixins: "fyi-ci" mixins: "xcode-10-try-caches" name: "ios12-sdk-xcode-clang" }
+    builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios12-sdk-device" }
+    builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios12-sdk-simulator" }
+    builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios12-sdk-xcode-clang" }
 
     # Win bots.
     builders {
@@ -2625,7 +2616,7 @@ buckets {
     builders { mixins: "ios-try" name: "ios-simulator" }
     builders { mixins: "ios-try" name: "ios-simulator-cronet" }
     builders { mixins: "ios-try" name: "ios-uirefresh-simulator" }
-    builders { mixins: "ios-try" mixins: "xcode-10-try-caches" name: "ios12-sdk-simulator" }
+    builders { mixins: "ios-try" name: "ios12-sdk-simulator" }
     builders { mixins: "ios-try" name: "ios-simulator-full-configs" }
     builders { mixins: "ios-try" name: "ios-simulator-eg" }
     builders { mixins: "ios-try" name: "ios-simulator-xcode-clang" }

ios/build/bots/chromium.clang/ToTiOS.json

@@ -2,7 +2,7 @@
   "comments": [
     "Clang tip-of-tree builder for iOS."
   ],
-  "xcode build version": "10L221o",
+  "xcode build version": "10l232m",
   "gn_args": [
     "ios_enable_code_signing=false",
     "is_component_build=false",

ios/build/bots/chromium.clang/clang_tot_device.json

@@ -2,7 +2,7 @@
   "comments": [
     "Clang tip-of-tree builder for iOS device."
   ],
-  "xcode build version": "10L221o",
+  "xcode build version": "10l232m",
   "gn_args": [
     "is_debug=false",
     "llvm_force_head_revision=true",

ios/build/bots/chromium.fyi/ios-device-goma-canary-clobber.json

@@ -3,7 +3,7 @@
     "Goma canary builder for iOS.",
     "It is chromium.mac/ios-device.json + use_goma_canary, clobber."
   ],
-  "xcode build version": "10L221o",
+  "xcode build version": "10l232m",
   "gn_args": [
     "additional_target_cpus=[ \"arm64\" ]",
     "goma_dir=\"$(goma_dir)\"",

ios/build/bots/chromium.fyi/ios-simulator.json

@@ -2,7 +2,7 @@
   "comments": [
     "Runs tests on FYI on the latest simulators."
   ],
-  "xcode build version": "10L221o",
+  "xcode build version": "10l232m",
   "gn_args": [
     "additional_target_cpus=[\"x86\"]",
     "goma_dir=\"$(goma_dir)\"",

ios/build/bots/chromium.fyi/ios12-beta-simulator.json

@@ -3,7 +3,7 @@
     "Run tests on iOS12beta track on 64-bit iOS 12 simulators.",
     "Note: Xcode 10 requires OSX 10.13.4 hence 'host os'"
   ],
-  "xcode build version": "10L221o",
+  "xcode build version": "10l232m",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "additional_target_cpus=[\"x86\"]",

ios/build/bots/chromium.mac/ios-device.json

@@ -4,7 +4,7 @@
     "Build is performed with gn+ninja.",
     "If modified, please change chromium.fyi/ios-device-goma-canary-clobber.json too."
   ],
-  "xcode build version": "10L221o",
+  "xcode build version": "10l232m",
   "gn_args": [
     "additional_target_cpus=[ \"arm64\" ]",
     "goma_dir=\"$(goma_dir)\"",

ios/build/bots/chromium.mac/ios-simulator-full-configs.json

@@ -3,7 +3,7 @@
     "Runs tests on 64-bit iOS 10, 11 and 12 tests on iPad, iPhone,",
     "@3x, and @2x on main waterfall ios-simulator-full-configs."
   ],
-  "xcode build version": "10L221o",
+  "xcode build version": "10l232m",
   "gn_args": [
     "additional_target_cpus=[\"x86\"]",
     "goma_dir=\"$(goma_dir)\"",

ios/build/bots/chromium.mac/ios-simulator.json

@@ -4,7 +4,7 @@
     "on iPad, iPhone, @3x, and @2x on main and CQ ios-simulator.",
     "Note: Xcode 10 requires Mac OS 10.13.4 or higher, hence 'host os'."
   ],
-  "xcode build version": "10L221o",
+  "xcode build version": "10l232m",
   "gn_args": [
     "additional_target_cpus=[\"x86\"]",
     "goma_dir=\"$(goma_dir)\"",

ios/build/bots/chromium.mac/ios-uirefresh-simulator.json

@@ -2,7 +2,7 @@
   "comments": [
     "UIRefresh tests for iPhone simulator."
   ],
-  "xcode build version": "10L221o",
+  "xcode build version": "10l232m",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "additional_target_cpus=[\"x86\"]",