From a5f3c20f2dab9bd706565144d0f9d1b60db767fe Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Mon, 7 Mar 2022 12:45:43 +0100 Subject: [PATCH] Fix warning 'Build argument has no effect: ios_build_chrome'. Same warning for ios_use_goma_rbe. https://logs.chromium.org/logs/webrtc/buildbucket/cr-buildbucket/8820359174215951313/+/u/generate_build_files/stdout Bug: webrtc:13556 Change-Id: I5342644d1f620d293a9a7f541ac59803dedf4d67 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/253840 Reviewed-by: Mirko Bonadei Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#36142} --- tools_webrtc/mb/mb_config.pyl | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl index d082ddc0cd..787bc131db 100644 --- a/tools_webrtc/mb/mb_config.pyl +++ b/tools_webrtc/mb/mb_config.pyl @@ -356,31 +356,27 @@ # iOS 'ios_debug_bot_arm64': [ - 'ios', 'debug_bot', 'arm64', 'no_ios_code_signing', 'ios_use_goma_rbe', - 'xctest', 'ios_no_chrome', + 'ios', 'debug_bot', 'arm64', 'no_ios_code_signing', + 'xctest' ], 'ios_release_bot_arm64': [ - 'ios', 'release_bot', 'arm64', 'no_ios_code_signing', 'ios_use_goma_rbe', - 'xctest', 'ios_no_chrome', + 'ios', 'release_bot', 'arm64', 'no_ios_code_signing', + 'xctest' ], 'ios_internal_debug_bot_arm64': [ - 'ios', 'debug_bot', 'arm64', 'ios_use_goma_rbe', - 'ios_code_signing_identity_description', 'xctest', - 'ios_no_chrome', + 'ios', 'debug_bot', 'arm64', + 'ios_code_signing_identity_description', 'xctest' ], 'ios_internal_release_bot_arm64': [ - 'ios', 'release_bot', 'arm64', 'ios_use_goma_rbe', - 'ios_code_signing_identity_description', 'xctest', - 'ios_no_chrome', + 'ios', 'release_bot', 'arm64', + 'ios_code_signing_identity_description', 'xctest' ], 'ios_internal_pure_release_bot_arm64': [ - 'ios', 'pure_release_bot', 'arm64', 'ios_use_goma_rbe', - 'ios_code_signing_identity_description', 'xctest', - 'ios_no_chrome', + 'ios', 'pure_release_bot', 'arm64', + 'ios_code_signing_identity_description', 'xctest' ], 'ios_debug_bot_x64': [ - 'ios', 'debug_bot', 'x64', 'ios_use_goma_rbe', 'xctest', - 'ios_no_chrome', + 'ios', 'debug_bot', 'x64', 'xctest' ], # More configs @@ -468,14 +464,6 @@ 'gn_args': 'ios_code_signing_identity_description="Apple Development"', }, - 'ios_no_chrome': { - 'gn_args': 'ios_build_chrome=false', - }, - - 'ios_use_goma_rbe': { - 'gn_args': 'ios_use_goma_rbe=true', - }, - 'ios': { 'gn_args': 'target_os="ios"', },