From fe2e7eaa207bd222529e96988481cb9466c4ce7f Mon Sep 17 00:00:00 2001 From: Christoffer Jansson Date: Wed, 2 Aug 2023 07:41:23 +0000 Subject: [PATCH] Reland "Add ARC enablement to WebRTC only if it isn't already present" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 787e326c180c4b2704c7ede99fa335b4fe4a5e83. Reason for revert: Downstream fixed Original change's description: > Revert "Add ARC enablement to WebRTC only if it isn't already present" > > This reverts commit 96137813f76c34322cf4912584e0997e941624f5. > > Reason for revert: Breaks downstream projects. > > Original change's description: > > Add ARC enablement to WebRTC only if it isn't already present > > > > WebRTC unconditionally enables ARC for Objective-C code. Chromium is > > now enabling this globally, so change WebRTC to only enable it if it's > > not already enabled. > > > > Bug: chromium:733237 > > Change-Id: I0d5694d0640bb79ae83209aa0bdd36e099b85042 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/314180 > > Reviewed-by: Mirko Bonadei > > Commit-Queue: Mirko Bonadei > > Cr-Commit-Position: refs/heads/main@{#40493} > > Bug: chromium:733237 > Change-Id: Ifbf79c030262897baec44ba0e67b21d54fcb6f77 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/314482 > Owners-Override: Christoffer Jansson > Commit-Queue: Christoffer Jansson > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com > Cr-Commit-Position: refs/heads/main@{#40496} Bug: chromium:733237 Change-Id: I47291a4c99ea3a70ea3083f8b9fe44f3ecc6582f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/314700 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Reviewed-by: Mirko Bonadei Commit-Queue: Christoffer Jansson Reviewed-by: Björn Terelius Cr-Commit-Position: refs/heads/main@{#40498} --- webrtc.gni | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webrtc.gni b/webrtc.gni index 4b3ce8635f..c6509c837b 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -356,7 +356,10 @@ webrtc_root = get_path_info(".", "abspath") rtc_common_configs = [ webrtc_root + ":common_config" ] if (is_mac || is_ios) { - rtc_common_configs += [ "//build/config/compiler:enable_arc" ] + if (filter_include(default_compiler_configs, + [ "//build/config/compiler:enable_arc" ]) == []) { + rtc_common_configs += [ "//build/config/compiler:enable_arc" ] + } } # Global public configuration that should be applied to all WebRTC targets. You