From 5e5a072f2c405e355e5e481f8dd784d84f4b2dce Mon Sep 17 00:00:00 2001
From: Henrik Kjellander <kjellander@webrtc.org>
Date: Wed, 8 Feb 2017 12:04:20 +0100
Subject: [PATCH] iOS: Fix breakage caused by buildbot recipe update

Similar changes as in https://codereview.chromium.org/2659123003
Our MB configuration is still the actually used build config for these
bots.

BUG=686304
TBR=smut@google.com

Review-Url: https://codereview.webrtc.org/2685813003 .
Cr-Commit-Position: refs/heads/master@{#16486}
---
 tools-webrtc/ios/client.webrtc/iOS32_Debug.json             | 6 ++----
 tools-webrtc/ios/client.webrtc/iOS32_Release.json           | 6 ++----
 .../ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json        | 6 ++----
 tools-webrtc/ios/client.webrtc/iOS64_Debug.json             | 6 ++----
 tools-webrtc/ios/client.webrtc/iOS64_Release.json           | 6 ++----
 .../ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json       | 6 ++----
 .../ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json        | 6 ++----
 tools-webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json   | 6 ++----
 tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json  | 6 ++----
 tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json   | 6 ++----
 tools-webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json        | 6 ++----
 tools-webrtc/ios/tryserver.webrtc/ios_arm64_rel.json        | 6 ++----
 tools-webrtc/ios/tryserver.webrtc/ios_dbg.json              | 6 ++----
 tools-webrtc/ios/tryserver.webrtc/ios_rel.json              | 6 ++----
 14 files changed, 28 insertions(+), 56 deletions(-)

diff --git a/tools-webrtc/ios/client.webrtc/iOS32_Debug.json b/tools-webrtc/ios/client.webrtc/iOS32_Debug.json
index 44de732ee9..71ab117083 100644
--- a/tools-webrtc/ios/client.webrtc/iOS32_Debug.json
+++ b/tools-webrtc/ios/client.webrtc/iOS32_Debug.json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Builder for 32-bit devices.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,9 +7,10 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=true",
+    "target_cpu=\"arm\"",
     "use_goma=true"
   ],
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphoneos10.0",
diff --git a/tools-webrtc/ios/client.webrtc/iOS32_Release.json b/tools-webrtc/ios/client.webrtc/iOS32_Release.json
index 3b8310fa58..1fe57bc6ef 100644
--- a/tools-webrtc/ios/client.webrtc/iOS32_Release.json
+++ b/tools-webrtc/ios/client.webrtc/iOS32_Release.json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Builder for 32-bit devices.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,9 +7,10 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=false",
+    "target_cpu=\"arm\"",
     "use_goma=true"
   ],
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Release",
   "sdk": "iphoneos10.0",
diff --git a/tools-webrtc/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json b/tools-webrtc/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json
index 43f4ddd373..f5b02fdd19 100644
--- a/tools-webrtc/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json
+++ b/tools-webrtc/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Tests for 32-bit iOS simulators.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,9 +7,10 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=true",
+    "target_cpu=\"x86\"",
     "use_goma=true"
   ],
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator9.0",
diff --git a/tools-webrtc/ios/client.webrtc/iOS64_Debug.json b/tools-webrtc/ios/client.webrtc/iOS64_Debug.json
index 9060d43c7a..d8a69c93e4 100644
--- a/tools-webrtc/ios/client.webrtc/iOS64_Debug.json
+++ b/tools-webrtc/ios/client.webrtc/iOS64_Debug.json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Builder for 64-bit devices.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,9 +7,10 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=true",
+    "target_cpu=\"arm64\"",
     "use_goma=true"
   ],
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphoneos10.0",
diff --git a/tools-webrtc/ios/client.webrtc/iOS64_Release.json b/tools-webrtc/ios/client.webrtc/iOS64_Release.json
index fe5b894214..1cc6e2ae02 100644
--- a/tools-webrtc/ios/client.webrtc/iOS64_Release.json
+++ b/tools-webrtc/ios/client.webrtc/iOS64_Release.json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Builder for 64-bit devices.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,9 +7,10 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=false",
+    "target_cpu=\"arm64\"",
     "use_goma=true"
   ],
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Release",
   "sdk": "iphoneos10.0",
diff --git a/tools-webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json b/tools-webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json
index ff64c0ff90..5c4fb8b6ba 100644
--- a/tools-webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json
+++ b/tools-webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Tests for 64-bit iOS simulators.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,9 +7,10 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=true",
+    "target_cpu=\"x64\"",
     "use_goma=true"
   ],
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator10.0",
diff --git a/tools-webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json b/tools-webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json
index cbd05e5b59..ae82e87d78 100644
--- a/tools-webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json
+++ b/tools-webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Tests for 64-bit iOS simulators.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,9 +7,10 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=true",
+    "target_cpu=\"x64\"",
     "use_goma=true"
   ],
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator9.0",
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json b/tools-webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json
index 7633db9f18..96c4964973 100644
--- a/tools-webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json
+++ b/tools-webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Tests for 32-bit iOS simulators.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,10 +7,11 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=true",
+    "target_cpu=\"x86\"",
     "use_goma=true"
   ],
   "use_analyze": false,
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator9.0",
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json b/tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json
index 4952f0a57a..432768e61a 100644
--- a/tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json
+++ b/tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Tests for 64-bit iOS simulators.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,10 +7,11 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=true",
+    "target_cpu=\"x64\"",
     "use_goma=true"
   ],
   "use_analyze": false,
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator10.0",
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json b/tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json
index 02c49c8bce..cf02f64f02 100644
--- a/tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json
+++ b/tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Tests for 64-bit iOS simulators.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,10 +7,11 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=true",
+    "target_cpu=\"x64\"",
     "use_goma=true"
   ],
   "use_analyze": false,
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator9.0",
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json b/tools-webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json
index f4c605cb7c..f1287d1f36 100644
--- a/tools-webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json
+++ b/tools-webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Builder for 64-bit devices.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,10 +7,11 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=true",
+    "target_cpu=\"arm64\"",
     "use_goma=true"
   ],
   "use_analyze": false,
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphoneos10.0",
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios_arm64_rel.json b/tools-webrtc/ios/tryserver.webrtc/ios_arm64_rel.json
index 719c8074d0..7645fd3b67 100644
--- a/tools-webrtc/ios/tryserver.webrtc/ios_arm64_rel.json
+++ b/tools-webrtc/ios/tryserver.webrtc/ios_arm64_rel.json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Builder for 64-bit devices.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,10 +7,11 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=false",
+    "target_cpu=\"arm64\"",
     "use_goma=true"
   ],
   "use_analyze": false,
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Release",
   "sdk": "iphoneos10.0",
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios_dbg.json b/tools-webrtc/ios/tryserver.webrtc/ios_dbg.json
index f78ef81b15..bcba06f47b 100644
--- a/tools-webrtc/ios/tryserver.webrtc/ios_dbg.json
+++ b/tools-webrtc/ios/tryserver.webrtc/ios_dbg.json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Builder for 32-bit devices.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,10 +7,11 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=true",
+    "target_cpu=\"arm\"",
     "use_goma=true"
   ],
   "use_analyze": false,
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphoneos10.0",
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios_rel.json b/tools-webrtc/ios/tryserver.webrtc/ios_rel.json
index 29eda352d7..a8601d7f92 100644
--- a/tools-webrtc/ios/tryserver.webrtc/ios_rel.json
+++ b/tools-webrtc/ios/tryserver.webrtc/ios_rel.json
@@ -1,7 +1,4 @@
 {
-  "owners": [
-    "kjellander"
-  ],
   "comments": [
     "Builder for 32-bit devices.",
     "gn_args in this file is only read by the buildbot recipe; ",
@@ -10,10 +7,11 @@
   ],
   "xcode version": "8.0",
   "gn_args": [
+    "is_debug=false",
+    "target_cpu=\"arm\"",
     "use_goma=true"
   ],
   "use_analyze": false,
-  "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Release",
   "sdk": "iphoneos10.0",