From 5f2c0cc0adfafa2e99fea900cd60103f8d2018c4 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 16 Apr 2018 10:27:55 +0200 Subject: [PATCH] Do not build 'all' on iOS trybots. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems iOS trybots are the only ones that build "all". This causes problems when using Abseil because some targets in //third_party/abseil-cpp fail to build (because they depend on CCTZ). Bug: webrtc:8821 Change-Id: I017ecb0527a7e3f3c59f41053fa1878d16cbe4e9 No-Try: True Reviewed-on: https://webrtc-review.googlesource.com/70140 Commit-Queue: Mirko Bonadei Reviewed-by: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#22890} --- tools_webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json | 2 +- tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json | 2 +- tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios11_dbg.json | 2 +- tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json | 2 +- tools_webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json | 2 +- tools_webrtc/ios/tryserver.webrtc/ios_arm64_rel.json | 2 +- tools_webrtc/ios/tryserver.webrtc/ios_dbg.json | 2 +- tools_webrtc/ios/tryserver.webrtc/ios_rel.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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 a82cfead56..f840977258 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json @@ -12,7 +12,7 @@ "use_goma=true" ], "use_analyze": false, - "additional_compile_targets": [ "all" ], + "additional_compile_targets": [], "configuration": "Debug", "sdk": "iphonesimulator9.3", "tests": [ 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 28f96201fc..c3f2e18f41 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json @@ -12,7 +12,7 @@ "use_goma=true" ], "use_analyze": false, - "additional_compile_targets": [ "all" ], + "additional_compile_targets": [], "configuration": "Debug", "sdk": "iphonesimulator10.3", "tests": [ diff --git a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios11_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios11_dbg.json index 4a2ad07d8e..6738f24f0f 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios11_dbg.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios11_dbg.json @@ -12,7 +12,7 @@ "use_goma=true" ], "use_analyze": false, - "additional_compile_targets": [ "all" ], + "additional_compile_targets": [], "configuration": "Debug", "sdk": "iphonesimulator11.0", "tests": [ 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 4c1af2d3bd..5380912832 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json @@ -12,7 +12,7 @@ "use_goma=true" ], "use_analyze": false, - "additional_compile_targets": [ "all" ], + "additional_compile_targets": [], "configuration": "Debug", "sdk": "iphonesimulator9.3", "tests": [ diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json index a718b7acad..bfa083fbe7 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json @@ -13,7 +13,7 @@ "use_goma=true" ], "use_analyze": false, - "additional_compile_targets": [ "all" ], + "additional_compile_targets": [], "configuration": "Debug", "sdk": "iphoneos10.3", "tests": [ diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_arm64_rel.json b/tools_webrtc/ios/tryserver.webrtc/ios_arm64_rel.json index 7d2f923b57..576f54c9d7 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios_arm64_rel.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios_arm64_rel.json @@ -14,7 +14,7 @@ "use_goma=true" ], "use_analyze": false, - "additional_compile_targets": [ "all" ], + "additional_compile_targets": [], "configuration": "Release", "sdk": "iphoneos10.3", "tests": [ diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios_dbg.json index 4c5aca5ef7..51a4415332 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios_dbg.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios_dbg.json @@ -13,7 +13,7 @@ "use_goma=true" ], "use_analyze": false, - "additional_compile_targets": [ "all" ], + "additional_compile_targets": [], "configuration": "Debug", "sdk": "iphoneos10.3", "tests": [ diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_rel.json b/tools_webrtc/ios/tryserver.webrtc/ios_rel.json index 81c16db60a..4803b3fef0 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios_rel.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios_rel.json @@ -14,7 +14,7 @@ "use_goma=true" ], "use_analyze": false, - "additional_compile_targets": [ "all" ], + "additional_compile_targets": [], "configuration": "Release", "sdk": "iphoneos10.3", "tests": [