diff --git a/webrtc/build/ios/client.webrtc/iOS32_Debug.json b/webrtc/build/ios/client.webrtc/iOS32_Debug.json
index 1565d084e1..e1e68f9eaf 100644
--- a/webrtc/build/ios/client.webrtc/iOS32_Debug.json
+++ b/webrtc/build/ios/client.webrtc/iOS32_Debug.json
@@ -24,8 +24,9 @@
     "goma_dir=\"$(goma_dir)\"",
     "target_cpu=\"arm\""
   ],
-  "mb_type": "gyp",
+  "mb_type": "gn",
   "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphoneos9.0",
   "tests": [
diff --git a/webrtc/build/ios/client.webrtc/iOS32_Release.json b/webrtc/build/ios/client.webrtc/iOS32_Release.json
index 01b27976a8..cfd584636a 100644
--- a/webrtc/build/ios/client.webrtc/iOS32_Release.json
+++ b/webrtc/build/ios/client.webrtc/iOS32_Release.json
@@ -24,8 +24,9 @@
     "goma_dir=\"$(goma_dir)\"",
     "target_cpu=\"arm\""
   ],
-  "mb_type": "gyp",
+  "mb_type": "gn",
   "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
   "configuration": "Release",
   "sdk": "iphoneos9.0",
   "tests": [
diff --git a/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json b/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json
index c76977891e..1c7ae952ac 100644
--- a/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json
+++ b/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json
@@ -24,8 +24,9 @@
     "goma_dir=\"$(goma_dir)\"",
     "target_cpu=\"x86\""
   ],
-  "mb_type": "gyp",
+  "mb_type": "gn",
   "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator9.0",
   "tests": [
diff --git a/webrtc/build/ios/client.webrtc/iOS64_Debug.json b/webrtc/build/ios/client.webrtc/iOS64_Debug.json
index 338c589cca..d72245b99c 100644
--- a/webrtc/build/ios/client.webrtc/iOS64_Debug.json
+++ b/webrtc/build/ios/client.webrtc/iOS64_Debug.json
@@ -24,8 +24,9 @@
     "goma_dir=\"$(goma_dir)\"",
     "target_cpu=\"arm64\""
   ],
-  "mb_type": "gyp",
+  "mb_type": "gn",
   "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphoneos9.0",
   "tests": [
diff --git a/webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json b/webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json
index d72245b99c..3d18479607 100644
--- a/webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json
+++ b/webrtc/build/ios/client.webrtc/iOS64_Debug_(GN).json
@@ -24,7 +24,7 @@
     "goma_dir=\"$(goma_dir)\"",
     "target_cpu=\"arm64\""
   ],
-  "mb_type": "gn",
+  "mb_type": "gyp",
   "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
diff --git a/webrtc/build/ios/client.webrtc/iOS64_Debug_(GYP).json b/webrtc/build/ios/client.webrtc/iOS64_Debug_(GYP).json
new file mode 100644
index 0000000000..3d18479607
--- /dev/null
+++ b/webrtc/build/ios/client.webrtc/iOS64_Debug_(GYP).json
@@ -0,0 +1,34 @@
+{
+  "owners": [
+    "kjellander"
+  ],
+  "comments": [
+    "Builder for 64-bit devices.",
+    "GYP_DEFINES and gn_args in this file are only used during runhooks; ",
+    "webrtc/build/mb_config.pyl decides the generated projects that are compiled."
+  ],
+  "xcode version": "7.0",
+  "GYP_DEFINES": [
+    "use_goma=1",
+    "gomadir=$(goma_dir)",
+    "chromium_ios_signing=0",
+    "component=static_library",
+    "target_arch=arm64"
+  ],
+  "gn_args": [
+    "is_debug=true",
+    "target_os=\"ios\"",
+    "ios_enable_code_signing=false",
+    "is_component_build=false",
+    "use_goma=true",
+    "goma_dir=\"$(goma_dir)\"",
+    "target_cpu=\"arm64\""
+  ],
+  "mb_type": "gyp",
+  "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
+  "configuration": "Debug",
+  "sdk": "iphoneos9.0",
+  "tests": [
+  ]
+}
diff --git a/webrtc/build/ios/client.webrtc/iOS64_Release.json b/webrtc/build/ios/client.webrtc/iOS64_Release.json
index e6927ef541..f67d358d07 100644
--- a/webrtc/build/ios/client.webrtc/iOS64_Release.json
+++ b/webrtc/build/ios/client.webrtc/iOS64_Release.json
@@ -24,8 +24,9 @@
     "goma_dir=\"$(goma_dir)\"",
     "target_cpu=\"arm64\""
   ],
-  "mb_type": "gyp",
+  "mb_type": "gn",
   "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
   "configuration": "Release",
   "sdk": "iphoneos9.0",
   "tests": [
diff --git a/webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json b/webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json
index f67d358d07..69bdf42166 100644
--- a/webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json
+++ b/webrtc/build/ios/client.webrtc/iOS64_Release_(GN).json
@@ -24,7 +24,7 @@
     "goma_dir=\"$(goma_dir)\"",
     "target_cpu=\"arm64\""
   ],
-  "mb_type": "gn",
+  "mb_type": "gyp",
   "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
   "configuration": "Release",
diff --git a/webrtc/build/ios/client.webrtc/iOS64_Release_(GYP).json b/webrtc/build/ios/client.webrtc/iOS64_Release_(GYP).json
new file mode 100644
index 0000000000..69bdf42166
--- /dev/null
+++ b/webrtc/build/ios/client.webrtc/iOS64_Release_(GYP).json
@@ -0,0 +1,34 @@
+{
+  "owners": [
+    "kjellander"
+  ],
+  "comments": [
+    "Builder for 64-bit devices.",
+    "GYP_DEFINES and gn_args in this file are only used during runhooks; ",
+    "webrtc/build/mb_config.pyl decides the generated projects that are compiled."
+  ],
+  "xcode version": "7.0",
+  "GYP_DEFINES": [
+    "use_goma=1",
+    "gomadir=$(goma_dir)",
+    "chromium_ios_signing=0",
+    "component=static_library",
+    "target_arch=arm64"
+  ],
+  "gn_args": [
+    "is_debug=false",
+    "target_os=\"ios\"",
+    "ios_enable_code_signing=false",
+    "is_component_build=false",
+    "use_goma=true",
+    "goma_dir=\"$(goma_dir)\"",
+    "target_cpu=\"arm64\""
+  ],
+  "mb_type": "gyp",
+  "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
+  "configuration": "Release",
+  "sdk": "iphoneos9.0",
+  "tests": [
+  ]
+}
diff --git a/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json b/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json
index 14b93884dd..e211c9b0bf 100644
--- a/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json
+++ b/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json
@@ -24,8 +24,9 @@
     "goma_dir=\"$(goma_dir)\"",
     "target_cpu=\"x64\""
   ],
-  "mb_type": "gyp",
+  "mb_type": "gn",
   "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator9.0",
   "tests": [
diff --git a/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json
index a915fdbcb4..78570b9a32 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json
@@ -24,9 +24,10 @@
     "goma_dir=\"$(goma_dir)\"",
     "target_cpu=\"x86\""
   ],
-  "mb_type": "gyp",
+  "mb_type": "gn",
   "use_analyze": false,
   "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator9.0",
   "tests": [
diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json
index e53856683c..c4b81a6a3d 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json
@@ -24,7 +24,7 @@
     "goma_dir=\"$(goma_dir)\"",
     "target_cpu=\"arm64\""
   ],
-  "mb_type": "gn",
+  "mb_type": "gyp",
   "use_analyze": false,
   "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json b/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json
index 9cc49c21ac..9947702fdd 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json
@@ -24,7 +24,7 @@
     "goma_dir=\"$(goma_dir)\"",
     "target_cpu=\"arm64\""
   ],
-  "mb_type": "gn",
+  "mb_type": "gyp",
   "use_analyze": false,
   "compiler": "ninja",
   "additional_compile_targets": [ "all" ],
diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_gyp_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios64_gyp_dbg.json
new file mode 100644
index 0000000000..c4b81a6a3d
--- /dev/null
+++ b/webrtc/build/ios/tryserver.webrtc/ios64_gyp_dbg.json
@@ -0,0 +1,35 @@
+{
+  "owners": [
+    "kjellander"
+  ],
+  "comments": [
+    "GN + Ninja builder.",
+    "GYP_DEFINES and gn_args in this file are only used during runhooks; ",
+    "webrtc/build/mb_config.pyl decides the generated projects that are compiled."
+  ],
+  "xcode version": "7.0",
+  "GYP_DEFINES": [
+    "use_goma=1",
+    "gomadir=$(goma_dir)",
+    "chromium_ios_signing=0",
+    "component=static_library",
+    "target_arch=arm64"
+  ],
+  "gn_args": [
+    "is_debug=true",
+    "target_os=\"ios\"",
+    "ios_enable_code_signing=false",
+    "is_component_build=false",
+    "use_goma=true",
+    "goma_dir=\"$(goma_dir)\"",
+    "target_cpu=\"arm64\""
+  ],
+  "mb_type": "gyp",
+  "use_analyze": false,
+  "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
+  "configuration": "Debug",
+  "sdk": "iphoneos9.0",
+  "tests": [
+  ]
+}
diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_gyp_rel.json b/webrtc/build/ios/tryserver.webrtc/ios64_gyp_rel.json
new file mode 100644
index 0000000000..9947702fdd
--- /dev/null
+++ b/webrtc/build/ios/tryserver.webrtc/ios64_gyp_rel.json
@@ -0,0 +1,35 @@
+{
+  "owners": [
+    "kjellander"
+  ],
+  "comments": [
+    "GN + Ninja builder.",
+    "GYP_DEFINES and gn_args in this file are only used during runhooks; ",
+    "webrtc/build/mb_config.pyl decides the generated projects that are compiled."
+  ],
+  "xcode version": "7.0",
+  "GYP_DEFINES": [
+    "use_goma=1",
+    "gomadir=$(goma_dir)",
+    "chromium_ios_signing=0",
+    "component=static_library",
+    "target_arch=arm64"
+  ],
+  "gn_args": [
+    "is_debug=false",
+    "target_os=\"ios\"",
+    "ios_enable_code_signing=false",
+    "is_component_build=false",
+    "use_goma=true",
+    "goma_dir=\"$(goma_dir)\"",
+    "target_cpu=\"arm64\""
+  ],
+  "mb_type": "gyp",
+  "use_analyze": false,
+  "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
+  "configuration": "Release",
+  "sdk": "iphoneos9.0",
+  "tests": [
+  ]
+}
diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json
index 780a8cc295..c7fe50a6fb 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json
@@ -24,9 +24,10 @@
     "goma_dir=\"$(goma_dir)\"",
     "target_cpu=\"x64\""
   ],
-  "mb_type": "gyp",
+  "mb_type": "gn",
   "use_analyze": false,
   "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator9.0",
   "tests": [
diff --git a/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json
index 629af7a2e4..97f0fc392a 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json
@@ -25,8 +25,9 @@
     "target_cpu=\"arm64\""
   ],
   "use_analyze": false,
-  "mb_type": "gyp",
+  "mb_type": "gn",
   "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphoneos9.0",
   "tests": [
diff --git a/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json b/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json
index 77ca520fe9..320d9a27ae 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json
@@ -25,8 +25,9 @@
     "target_cpu=\"arm64\""
   ],
   "use_analyze": false,
-  "mb_type": "gyp",
+  "mb_type": "gn",
   "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
   "configuration": "Release",
   "sdk": "iphoneos9.0",
   "tests": [
diff --git a/webrtc/build/ios/tryserver.webrtc/ios_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios_dbg.json
index 31fb57729b..7a4d17470f 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios_dbg.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios_dbg.json
@@ -25,8 +25,9 @@
     "target_cpu=\"arm\""
   ],
   "use_analyze": false,
-  "mb_type": "gyp",
+  "mb_type": "gn",
   "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphoneos9.0",
   "tests": [
diff --git a/webrtc/build/ios/tryserver.webrtc/ios_rel.json b/webrtc/build/ios/tryserver.webrtc/ios_rel.json
index f669e29722..330e7e33a3 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios_rel.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios_rel.json
@@ -25,8 +25,9 @@
     "target_cpu=\"arm\""
   ],
   "use_analyze": false,
-  "mb_type": "gyp",
+  "mb_type": "gn",
   "compiler": "ninja",
+  "additional_compile_targets": [ "all" ],
   "configuration": "Release",
   "sdk": "iphoneos9.0",
   "tests": [
diff --git a/webrtc/build/mb_config.pyl b/webrtc/build/mb_config.pyl
index bd5d656074..e24258cd70 100644
--- a/webrtc/build/mb_config.pyl
+++ b/webrtc/build/mb_config.pyl
@@ -20,14 +20,18 @@
   'masters': {
     'client.webrtc': {
       # iOS
-      'iOS32 Debug': 'ios_gyp_debug_static_bot_arm_device',
-      'iOS32 Release': 'ios_gyp_release_bot_arm_device',
-      'iOS64 Debug': 'ios_gyp_debug_static_bot_arm64_device',
-      'iOS64 Release': 'ios_gyp_release_bot_arm64_device',
-      'iOS32 Simulator Debug': 'ios_gyp_debug_static_bot_x86',
-      'iOS64 Simulator Debug': 'ios_gyp_debug_static_bot_x64',
-      'iOS64 Debug (GN)': 'ios_gn_debug_static_bot_arm64_device',
-      'iOS64 Release (GN)': 'ios_gn_release_bot_arm64_device',
+      'iOS32 Debug': 'ios_gn_debug_static_bot_arm_device',
+      'iOS32 Release': 'ios_gn_release_bot_arm_device',
+      'iOS64 Debug': 'ios_gn_debug_static_bot_arm64_device',
+      'iOS64 Release': 'ios_gn_release_bot_arm64_device',
+      'iOS32 Simulator Debug': 'ios_gn_debug_static_bot_x86',
+      'iOS64 Simulator Debug': 'ios_gn_debug_static_bot_x64',
+      # TODO(kjellander): Remove the two GN configs below as soon we've renamed
+      # the bots to the GYP versions (duplicated now).
+      'iOS64 Debug (GN)': 'ios_gyp_debug_static_bot_arm64_device',
+      'iOS64 Release (GN)': 'ios_gyp_release_bot_arm64_device',
+      'iOS64 Debug (GYP)': 'ios_gyp_debug_static_bot_arm64_device',
+      'iOS64 Release (GYP)': 'ios_gyp_release_bot_arm64_device',
 
       # Mac
       'Mac64 Debug': 'gn_debug_bot_x64',
@@ -103,14 +107,18 @@
     },
     'tryserver.webrtc': {
       # iOS
-      'ios_dbg': 'ios_gyp_debug_static_bot_arm_device',
-      'ios_rel': 'ios_gyp_release_bot_arm_device',
-      'ios_arm64_dbg': 'ios_gyp_debug_static_bot_arm64_device',
-      'ios_arm64_rel': 'ios_gyp_release_bot_arm64_device',
-      'ios32_sim_dbg': 'ios_gyp_debug_static_bot_x86',
-      'ios64_sim_dbg': 'ios_gyp_debug_static_bot_x64',
-      'ios64_gn_dbg': 'ios_gn_debug_static_bot_arm64_device',
-      'ios64_gn_rel': 'ios_gn_release_bot_arm64_device',
+      'ios_dbg': 'ios_gn_debug_static_bot_arm_device',
+      'ios_rel': 'ios_gn_release_bot_arm_device',
+      'ios_arm64_dbg': 'ios_gn_debug_static_bot_arm64_device',
+      'ios_arm64_rel': 'ios_gn_release_bot_arm64_device',
+      'ios32_sim_dbg': 'ios_gn_debug_static_bot_x86',
+      'ios64_sim_dbg': 'ios_gn_debug_static_bot_x64',
+      # TODO(kjellander): Remove the two GN configs below as soon we've renamed
+      # the bots to the GYP versions (duplicated now).
+      'ios64_gn_dbg': 'ios_gyp_debug_static_bot_arm64_device',
+      'ios64_gn_rel': 'ios_gyp_release_bot_arm64_device',
+      'ios64_gyp_dbg': 'ios_gyp_debug_static_bot_arm64_device',
+      'ios64_gyp_rel': 'ios_gyp_release_bot_arm64_device',
 
       # Mac
       'mac_compile_dbg': 'gn_debug_bot_x64',
@@ -209,11 +217,17 @@
     'ios_gn_release_bot_arm64_device': [
       'ios', 'gn', 'release_bot', 'arm64', 'device'
     ],
-    'ios_gyp_debug_static_bot_arm_device': [
-      'ios', 'gyp', 'debug_static_bot', 'arm', 'device'
+    'ios_gn_debug_static_bot_arm_device': [
+      'ios', 'gn', 'debug_static_bot', 'arm', 'device'
     ],
-    'ios_gyp_release_bot_arm_device': [
-      'ios', 'gyp', 'release_bot', 'arm', 'device'
+    'ios_gn_release_bot_arm_device': [
+      'ios', 'gn', 'release_bot', 'arm', 'device'
+    ],
+    'ios_gn_debug_static_bot_x86': [
+      'ios', 'gn', 'debug_static_bot', 'x86'
+    ],
+    'ios_gn_debug_static_bot_x64': [
+      'ios', 'gn', 'debug_static_bot', 'x64'
     ],
     'ios_gyp_debug_static_bot_arm64_device': [
       'ios', 'gyp', 'debug_static_bot', 'arm64', 'device'
@@ -221,12 +235,6 @@
     'ios_gyp_release_bot_arm64_device': [
       'ios', 'gyp', 'release_bot', 'arm64', 'device'
     ],
-    'ios_gyp_debug_static_bot_x86': [
-      'ios', 'gyp', 'debug_static_bot', 'x86'
-    ],
-    'ios_gyp_debug_static_bot_x64': [
-      'ios', 'gyp', 'release_bot', 'x64'
-    ],
 
     # Linux, Mac and Windows
     'gn_crosscompile_release_bot_arm': [