From 787e326c180c4b2704c7ede99fa335b4fe4a5e83 Mon Sep 17 00:00:00 2001 From: Christoffer Jansson Date: Tue, 1 Aug 2023 07:29:26 +0000 Subject: [PATCH] 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} --- webrtc.gni | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/webrtc.gni b/webrtc.gni index c6509c837b..4b3ce8635f 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -356,10 +356,7 @@ webrtc_root = get_path_info(".", "abspath") rtc_common_configs = [ webrtc_root + ":common_config" ] if (is_mac || is_ios) { - if (filter_include(default_compiler_configs, - [ "//build/config/compiler:enable_arc" ]) == []) { - rtc_common_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