diff --git a/tools_webrtc/ios/internal.client.webrtc/iOS64_Debug.json b/tools_webrtc/ios/internal.client.webrtc/iOS64_Debug.json
index e4f51d21c5..2af3a446b2 100644
--- a/tools_webrtc/ios/internal.client.webrtc/iOS64_Debug.json
+++ b/tools_webrtc/ios/internal.client.webrtc/iOS64_Debug.json
@@ -5,7 +5,6 @@
   "xcode build version": "10l232m",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
-    "is_component_build=false",
     "is_debug=true",
     "target_cpu=\"arm64\"",
     "target_os=\"ios\"",
@@ -14,7 +13,6 @@
   "env": {
     "MAC_TOOLCHAIN_REVISION": "8E2002-1"
   },
-  "use_analyze": false,
   "additional_compile_targets": [],
   "configuration": "Debug",
   "bucket": "chromium-webrtc",
diff --git a/tools_webrtc/ios/internal.client.webrtc/iOS64_Perf.json b/tools_webrtc/ios/internal.client.webrtc/iOS64_Perf.json
index 61a52292d5..14cb1144f8 100644
--- a/tools_webrtc/ios/internal.client.webrtc/iOS64_Perf.json
+++ b/tools_webrtc/ios/internal.client.webrtc/iOS64_Perf.json
@@ -5,7 +5,6 @@
   "xcode build version": "10l232m",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
-    "is_component_build=false",
     "is_debug=false",
     "target_cpu=\"arm64\"",
     "target_os=\"ios\"",
@@ -14,7 +13,6 @@
   "env": {
     "MAC_TOOLCHAIN_REVISION": "8E2002-1"
   },
-  "use_analyze": false,
   "additional_compile_targets": [],
   "configuration": "Release",
   "bucket": "chromium-webrtc",
diff --git a/tools_webrtc/ios/internal.client.webrtc/iOS64_Release.json b/tools_webrtc/ios/internal.client.webrtc/iOS64_Release.json
index 8937f77835..922fa9726f 100644
--- a/tools_webrtc/ios/internal.client.webrtc/iOS64_Release.json
+++ b/tools_webrtc/ios/internal.client.webrtc/iOS64_Release.json
@@ -6,7 +6,6 @@
   "gn_args": [
     "dcheck_always_on=true",
     "goma_dir=\"$(goma_dir)\"",
-    "is_component_build=false",
     "is_debug=false",
     "target_cpu=\"arm64\"",
     "target_os=\"ios\"",
@@ -15,7 +14,6 @@
   "env": {
     "MAC_TOOLCHAIN_REVISION": "8E2002-1"
   },
-  "use_analyze": false,
   "additional_compile_targets": [],
   "configuration": "Release",
   "bucket": "chromium-webrtc",
diff --git a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_dbg.json b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_dbg.json
index edd53bf5f0..50eef7cee3 100644
--- a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_dbg.json
+++ b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_dbg.json
@@ -5,7 +5,6 @@
   "xcode build version": "10l232m",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
-    "is_component_build=false",
     "is_debug=true",
     "target_cpu=\"arm64\"",
     "target_os=\"ios\"",
@@ -14,7 +13,6 @@
   "env": {
     "MAC_TOOLCHAIN_REVISION": "8E2002-1"
   },
-  "use_analyze": false,
   "additional_compile_targets": [],
   "configuration": "Debug",
   "bucket": "chromium-webrtc",
diff --git a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_perf.json b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_perf.json
index c59fc64919..e7b974355f 100644
--- a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_perf.json
+++ b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_perf.json
@@ -5,7 +5,6 @@
   "xcode build version": "10l232m",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
-    "is_component_build=false",
     "is_debug=false",
     "target_cpu=\"arm64\"",
     "target_os=\"ios\"",
@@ -14,7 +13,6 @@
   "env": {
     "MAC_TOOLCHAIN_REVISION": "8E2002-1"
   },
-  "use_analyze": false,
   "additional_compile_targets": [],
   "configuration": "Release",
   "bucket": "chromium-webrtc",
diff --git a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_rel.json b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_rel.json
index e23d552c11..58d4063b1a 100644
--- a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_rel.json
+++ b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_rel.json
@@ -6,7 +6,6 @@
   "gn_args": [
     "dcheck_always_on=true",
     "goma_dir=\"$(goma_dir)\"",
-    "is_component_build=false",
     "is_debug=false",
     "target_cpu=\"arm64\"",
     "target_os=\"ios\"",
@@ -15,7 +14,6 @@
   "env": {
     "MAC_TOOLCHAIN_REVISION": "8E2002-1"
   },
-  "use_analyze": false,
   "additional_compile_targets": [],
   "configuration": "Release",
   "bucket": "chromium-webrtc",
diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm64_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm64_dbg.json
index 43add6710e..e5422c7e26 100644
--- a/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm64_dbg.json
+++ b/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm64_dbg.json
@@ -7,13 +7,11 @@
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "ios_enable_code_signing=false",
-    "is_component_build=false",
     "is_debug=true",
     "target_cpu=\"arm64\"",
     "target_os=\"ios\"",
     "use_goma=true"
   ],
-  "use_analyze": false,
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphoneos10.3",
diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm64_rel.json b/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm64_rel.json
index 95a57e5226..60fc63f086 100644
--- a/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm64_rel.json
+++ b/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm64_rel.json
@@ -8,13 +8,11 @@
     "goma_dir=\"$(goma_dir)\"",
     "dcheck_always_on=true",
     "ios_enable_code_signing=false",
-    "is_component_build=false",
     "is_debug=false",
     "target_cpu=\"arm64\"",
     "target_os=\"ios\"",
     "use_goma=true"
   ],
-  "use_analyze": false,
   "additional_compile_targets": [ "all" ],
   "configuration": "Release",
   "sdk": "iphoneos10.3",
diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm_dbg.json
index 8be9e95c0f..1714707623 100644
--- a/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm_dbg.json
+++ b/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm_dbg.json
@@ -7,13 +7,11 @@
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "ios_enable_code_signing=false",
-    "is_component_build=false",
     "is_debug=true",
     "target_cpu=\"arm\"",
     "target_os=\"ios\"",
     "use_goma=true"
   ],
-  "use_analyze": false,
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphoneos10.3",
diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm_rel.json b/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm_rel.json
index f644940c7c..b66da56824 100644
--- a/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm_rel.json
+++ b/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm_rel.json
@@ -8,13 +8,11 @@
     "goma_dir=\"$(goma_dir)\"",
     "dcheck_always_on=true",
     "ios_enable_code_signing=false",
-    "is_component_build=false",
     "is_debug=false",
     "target_cpu=\"arm\"",
     "target_os=\"ios\"",
     "use_goma=true"
   ],
-  "use_analyze": false,
   "additional_compile_targets": [ "all" ],
   "configuration": "Release",
   "sdk": "iphoneos10.3",
diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios10.json b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios10.json
index ebb445b159..b9c6cdc091 100644
--- a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios10.json
+++ b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios10.json
@@ -6,13 +6,11 @@
   "xcode build version": "10l232m",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
-    "is_component_build=false",
     "is_debug=true",
     "target_cpu=\"x64\"",
     "target_os=\"ios\"",
     "use_goma=true"
   ],
-  "use_analyze": false,
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator10.3",
diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios11.json b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios11.json
index a5208088ae..45058fbc17 100644
--- a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios11.json
+++ b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios11.json
@@ -6,13 +6,11 @@
   "xcode build version": "10l232m",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
-    "is_component_build=false",
     "is_debug=true",
     "target_cpu=\"x64\"",
     "target_os=\"ios\"",
     "use_goma=true"
   ],
-  "use_analyze": false,
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator11.0",
diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios9.json b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios9.json
index 68b9d7c9bd..3cb04c7327 100644
--- a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios9.json
+++ b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios9.json
@@ -6,13 +6,11 @@
   "xcode build version": "10l232m",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
-    "is_component_build=false",
     "is_debug=true",
     "target_cpu=\"x64\"",
     "target_os=\"ios\"",
     "use_goma=true"
   ],
-  "use_analyze": false,
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator9.3",
diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x86_dbg_ios9.json b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x86_dbg_ios9.json
index 48eb409eaa..cf48ccbbb5 100644
--- a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x86_dbg_ios9.json
+++ b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x86_dbg_ios9.json
@@ -6,13 +6,11 @@
   "xcode build version": "10l232m",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
-    "is_component_build=false",
     "is_debug=true",
     "target_cpu=\"x86\"",
     "target_os=\"ios\"",
     "use_goma=true"
   ],
-  "use_analyze": false,
   "additional_compile_targets": [ "all" ],
   "configuration": "Debug",
   "sdk": "iphonesimulator9.3",