From bdaa0828b512635e186da8fbddbbe7fd0d3812a9 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 2 Aug 2023 00:33:39 +0100 Subject: [PATCH] Remove redundant ARC configs Upstream has enabled ARC by default for apple code. This change removes the individual setting of it across targets. Chromium change: https://chromium.googlesource.com/chromium/src/+/8485b150e05e24548ec98413ced34994ab9ef622 commit 8485b150e05e24548ec98413ced34994ab9ef622 Author: Avi Drissman Date: Mon Jul 31 18:07:39 2023 +0000 Rename "enable_arc2" to "enable_arc" Remove uses of "enable_arc" that snuck in, and rename "enable_arc2" to "enable_arc". Bug: 733237 --- base/mac/BUILD.gn | 2 -- browser/ui/BUILD.gn | 4 ---- build/ios/mojom/mojom_wrappers.gni | 1 - build/ios/mojom/public/base/BUILD.gn | 1 - components/brave_vpn/browser/connection/ikev2/mac/BUILD.gn | 1 - components/text_recognition/browser/BUILD.gn | 2 -- ios/BUILD.gn | 5 +---- ios/app/BUILD.gn | 1 - ios/browser/BUILD.gn | 2 -- ios/browser/api/ads/BUILD.gn | 5 +---- ios/browser/api/bookmarks/BUILD.gn | 2 -- ios/browser/api/bookmarks/exporter/BUILD.gn | 2 -- ios/browser/api/bookmarks/importer/BUILD.gn | 2 -- ios/browser/api/brave_rewards/BUILD.gn | 5 +---- ios/browser/api/brave_shields/BUILD.gn | 1 - ios/browser/api/brave_stats/BUILD.gn | 1 - ios/browser/api/brave_wallet/BUILD.gn | 5 +---- ios/browser/api/certificate/BUILD.gn | 2 -- ios/browser/api/certificate/models/BUILD.gn | 2 -- ios/browser/api/certificate/utils/BUILD.gn | 2 -- ios/browser/api/common/BUILD.gn | 2 -- ios/browser/api/favicon/BUILD.gn | 2 -- ios/browser/api/history/BUILD.gn | 2 -- ios/browser/api/ipfs/BUILD.gn | 1 - ios/browser/api/net/BUILD.gn | 2 -- ios/browser/api/ntp_background_images/BUILD.gn | 1 - ios/browser/api/opentabs/BUILD.gn | 2 -- ios/browser/api/p3a/BUILD.gn | 1 - ios/browser/api/password/BUILD.gn | 2 -- ios/browser/api/qr_code/BUILD.gn | 2 -- ios/browser/api/query_filter/BUILD.gn | 2 -- ios/browser/api/session_restore/BUILD.gn | 2 -- ios/browser/api/sync/BUILD.gn | 2 -- ios/browser/api/sync/driver/BUILD.gn | 2 -- ios/browser/api/url/BUILD.gn | 2 -- ios/browser/api/version_info/BUILD.gn | 1 - ios/browser/api/web/BUILD.gn | 2 -- ios/browser/api/web/web_state/BUILD.gn | 2 -- ios/browser/api/web_image/BUILD.gn | 2 -- ios/browser/brave_wallet/BUILD.gn | 1 - ios/browser/favicon/BUILD.gn | 2 -- ios/browser/keyed_service/BUILD.gn | 1 - ios/browser/providers/lottie/BUILD.gn | 1 - ios/browser/skus/BUILD.gn | 1 - ios/browser/svg/BUILD.gn | 2 -- ios/testing/BUILD.gn | 1 - test/BUILD.gn | 4 ---- 47 files changed, 4 insertions(+), 91 deletions(-) diff --git a/base/mac/BUILD.gn b/base/mac/BUILD.gn index aba32590ae3..4aacb4aa988 100644 --- a/base/mac/BUILD.gn +++ b/base/mac/BUILD.gn @@ -6,8 +6,6 @@ assert(is_apple) source_set("mac") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "conversions.h" ] frameworks = [ "Foundation.framework" ] diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn index 5d09c820eb3..37f8f6e91b1 100644 --- a/browser/ui/BUILD.gn +++ b/browser/ui/BUILD.gn @@ -423,10 +423,6 @@ source_set("ui") { } } - if (is_apple) { - configs += [ "//build/config/compiler:enable_arc" ] - } - if (is_win || is_mac || is_linux) { sources += [ "views/profiles/brave_incognito_menu_view.cc", diff --git a/build/ios/mojom/mojom_wrappers.gni b/build/ios/mojom/mojom_wrappers.gni index e5bf3bdd516..9c482ce76b4 100644 --- a/build/ios/mojom/mojom_wrappers.gni +++ b/build/ios/mojom/mojom_wrappers.gni @@ -99,7 +99,6 @@ template("ios_objc_mojom_wrappers") { public_deps = [] } sources = generate_wrappers_output - configs += [ "//build/config/compiler:enable_arc" ] public_configs = [ ":$type_headers_target_name" ] public_deps += [ ":$generate_wrappers_target", diff --git a/build/ios/mojom/public/base/BUILD.gn b/build/ios/mojom/public/base/BUILD.gn index 88eae5419ed..c96ddcfed3a 100644 --- a/build/ios/mojom/public/base/BUILD.gn +++ b/build/ios/mojom/public/base/BUILD.gn @@ -4,7 +4,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. source_set("base") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "base_values+private.h", "base_values.h", diff --git a/components/brave_vpn/browser/connection/ikev2/mac/BUILD.gn b/components/brave_vpn/browser/connection/ikev2/mac/BUILD.gn index 16f3053e700..a406920af42 100644 --- a/components/brave_vpn/browser/connection/ikev2/mac/BUILD.gn +++ b/components/brave_vpn/browser/connection/ikev2/mac/BUILD.gn @@ -29,5 +29,4 @@ source_set("mac") { "NetworkExtension.framework", "Foundation.framework", ] - configs += [ "//build/config/compiler:enable_arc" ] } diff --git a/components/text_recognition/browser/BUILD.gn b/components/text_recognition/browser/BUILD.gn index 792eb4de57c..fd5a776da13 100644 --- a/components/text_recognition/browser/BUILD.gn +++ b/components/text_recognition/browser/BUILD.gn @@ -40,7 +40,5 @@ component("browser") { "Foundation.framework", "Vision.framework", ] - - configs += [ "//build/config/compiler:enable_arc" ] } } diff --git a/ios/BUILD.gn b/ios/BUILD.gn index 56233c7cf49..0ae9e7de280 100644 --- a/ios/BUILD.gn +++ b/ios/BUILD.gn @@ -104,10 +104,7 @@ ios_framework_bundle("brave_core_ios_framework") { info_plist = "Info.plist" - configs += [ - ":internal_config", - "//build/config/compiler:enable_arc", - ] + configs += [ ":internal_config" ] deps = [ ":brave_core_umbrella_header", diff --git a/ios/app/BUILD.gn b/ios/app/BUILD.gn index 8e217a490b8..b841860b82e 100644 --- a/ios/app/BUILD.gn +++ b/ios/app/BUILD.gn @@ -11,7 +11,6 @@ source_set("app") { configs += [ "//brave/ios/browser/api/brave_wallet:mojom_header_config", "//brave/ios/browser/api/skus:mojom_header_config", - "//build/config/compiler:enable_arc", ] sources = [ diff --git a/ios/browser/BUILD.gn b/ios/browser/BUILD.gn index fed134702cc..68381ac578d 100644 --- a/ios/browser/BUILD.gn +++ b/ios/browser/BUILD.gn @@ -7,8 +7,6 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") source_set("browser") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "brave_web_client.h", "brave_web_client.mm", diff --git a/ios/browser/api/ads/BUILD.gn b/ios/browser/api/ads/BUILD.gn index ae4307f37a5..9ccc732ef91 100644 --- a/ios/browser/api/ads/BUILD.gn +++ b/ios/browser/api/ads/BUILD.gn @@ -12,10 +12,7 @@ config("external_config") { } source_set("ads") { - configs += [ - ":external_config", - "//build/config/compiler:enable_arc", - ] + configs += [ ":external_config" ] sources = [ "ads_client_bridge.h", diff --git a/ios/browser/api/bookmarks/BUILD.gn b/ios/browser/api/bookmarks/BUILD.gn index 8024b420da3..c121211a1de 100644 --- a/ios/browser/api/bookmarks/BUILD.gn +++ b/ios/browser/api/bookmarks/BUILD.gn @@ -7,8 +7,6 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") source_set("bookmarks") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "bookmark_model_listener_ios.h", "bookmark_model_listener_ios.mm", diff --git a/ios/browser/api/bookmarks/exporter/BUILD.gn b/ios/browser/api/bookmarks/exporter/BUILD.gn index 5e241418792..d1a4cac4039 100644 --- a/ios/browser/api/bookmarks/exporter/BUILD.gn +++ b/ios/browser/api/bookmarks/exporter/BUILD.gn @@ -7,8 +7,6 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") source_set("exporter") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "bookmark_html_writer.cc", "bookmark_html_writer.h", diff --git a/ios/browser/api/bookmarks/importer/BUILD.gn b/ios/browser/api/bookmarks/importer/BUILD.gn index 3df31abe863..7dd3169b705 100644 --- a/ios/browser/api/bookmarks/importer/BUILD.gn +++ b/ios/browser/api/bookmarks/importer/BUILD.gn @@ -7,8 +7,6 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") source_set("importer") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "bookmark_html_reader.cc", "bookmark_html_reader.h", diff --git a/ios/browser/api/brave_rewards/BUILD.gn b/ios/browser/api/brave_rewards/BUILD.gn index 2447201efca..b7c15f84e41 100644 --- a/ios/browser/api/brave_rewards/BUILD.gn +++ b/ios/browser/api/brave_rewards/BUILD.gn @@ -13,10 +13,7 @@ config("external_config") { } source_set("brave_rewards") { - configs += [ - ":external_config", - "//build/config/compiler:enable_arc", - ] + configs += [ ":external_config" ] sources = [ "brave_rewards_api.h", diff --git a/ios/browser/api/brave_shields/BUILD.gn b/ios/browser/api/brave_shields/BUILD.gn index e4cb5dbc73a..0c9b9158c37 100644 --- a/ios/browser/api/brave_shields/BUILD.gn +++ b/ios/browser/api/brave_shields/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("brave_shields") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "adblock_engine.h", "adblock_engine.mm", diff --git a/ios/browser/api/brave_stats/BUILD.gn b/ios/browser/api/brave_stats/BUILD.gn index ee287786bd3..88d9752a895 100644 --- a/ios/browser/api/brave_stats/BUILD.gn +++ b/ios/browser/api/brave_stats/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("brave_stats") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "brave_stats+private.h", "brave_stats.h", diff --git a/ios/browser/api/brave_wallet/BUILD.gn b/ios/browser/api/brave_wallet/BUILD.gn index 07eaa22cd1e..454b7cfc075 100644 --- a/ios/browser/api/brave_wallet/BUILD.gn +++ b/ios/browser/api/brave_wallet/BUILD.gn @@ -16,10 +16,7 @@ config("mojom_header_config") { } source_set("brave_wallet") { - configs += [ - ":mojom_header_config", - "//build/config/compiler:enable_arc", - ] + configs += [ ":mojom_header_config" ] sources = [ "brave_wallet_api+private.h", "brave_wallet_api.h", diff --git a/ios/browser/api/certificate/BUILD.gn b/ios/browser/api/certificate/BUILD.gn index b667199b2d4..6bfb68342ce 100644 --- a/ios/browser/api/certificate/BUILD.gn +++ b/ios/browser/api/certificate/BUILD.gn @@ -4,8 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("certificate") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "brave_certificate.h", "brave_certificate.mm", diff --git a/ios/browser/api/certificate/models/BUILD.gn b/ios/browser/api/certificate/models/BUILD.gn index ce8d0f30ba2..4685b6e6f07 100644 --- a/ios/browser/api/certificate/models/BUILD.gn +++ b/ios/browser/api/certificate/models/BUILD.gn @@ -4,8 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("models") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "brave_certificate_enums.h", "brave_certificate_fingerprint.h", diff --git a/ios/browser/api/certificate/utils/BUILD.gn b/ios/browser/api/certificate/utils/BUILD.gn index 2f699cfe57a..acdb8f1f239 100644 --- a/ios/browser/api/certificate/utils/BUILD.gn +++ b/ios/browser/api/certificate/utils/BUILD.gn @@ -4,8 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("utils") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "brave_certificate_utils.h", "brave_certificate_utils.mm", diff --git a/ios/browser/api/common/BUILD.gn b/ios/browser/api/common/BUILD.gn index 2edaa46a524..25de5d9da47 100644 --- a/ios/browser/api/common/BUILD.gn +++ b/ios/browser/api/common/BUILD.gn @@ -7,8 +7,6 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") source_set("common") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "common_operations.h", "common_operations.mm", diff --git a/ios/browser/api/favicon/BUILD.gn b/ios/browser/api/favicon/BUILD.gn index 0fd25462575..459259d54ed 100644 --- a/ios/browser/api/favicon/BUILD.gn +++ b/ios/browser/api/favicon/BUILD.gn @@ -4,8 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("favicon") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "favicon_driver.h", "favicon_driver.mm", diff --git a/ios/browser/api/history/BUILD.gn b/ios/browser/api/history/BUILD.gn index 9751cf227c3..491347897e0 100644 --- a/ios/browser/api/history/BUILD.gn +++ b/ios/browser/api/history/BUILD.gn @@ -7,8 +7,6 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") source_set("history") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "brave_history_api+private.h", "brave_history_api.h", diff --git a/ios/browser/api/ipfs/BUILD.gn b/ios/browser/api/ipfs/BUILD.gn index 06c57685f7d..42f7decff52 100644 --- a/ios/browser/api/ipfs/BUILD.gn +++ b/ios/browser/api/ipfs/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at https://mozilla.org/MPL/2.0/. source_set("ipfs") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "ipfs_api+private.h", "ipfs_api.h", diff --git a/ios/browser/api/net/BUILD.gn b/ios/browser/api/net/BUILD.gn index 09bb4e1d658..078877993fd 100644 --- a/ios/browser/api/net/BUILD.gn +++ b/ios/browser/api/net/BUILD.gn @@ -8,8 +8,6 @@ import("//ios/build/config.gni") import("//net/features.gni") source_set("net") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "certificate_utility.h", "certificate_utility.mm", diff --git a/ios/browser/api/ntp_background_images/BUILD.gn b/ios/browser/api/ntp_background_images/BUILD.gn index 2c2b7b0959d..5d0536d6e85 100644 --- a/ios/browser/api/ntp_background_images/BUILD.gn +++ b/ios/browser/api/ntp_background_images/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at https://mozilla.org/MPL/2.0/. source_set("ntp_background_images") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "ntp_background_image+private.h", "ntp_background_image.h", diff --git a/ios/browser/api/opentabs/BUILD.gn b/ios/browser/api/opentabs/BUILD.gn index d7397d81379..11a9f8915ae 100644 --- a/ios/browser/api/opentabs/BUILD.gn +++ b/ios/browser/api/opentabs/BUILD.gn @@ -7,8 +7,6 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") source_set("opentabs") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "brave_opentabs_api+private.h", "brave_opentabs_api.h", diff --git a/ios/browser/api/p3a/BUILD.gn b/ios/browser/api/p3a/BUILD.gn index 7d16b8f558e..f014e778f26 100644 --- a/ios/browser/api/p3a/BUILD.gn +++ b/ios/browser/api/p3a/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("p3a") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "brave_histograms_controller+private.h", "brave_histograms_controller.h", diff --git a/ios/browser/api/password/BUILD.gn b/ios/browser/api/password/BUILD.gn index 0efd0987c14..b979c2fd86f 100644 --- a/ios/browser/api/password/BUILD.gn +++ b/ios/browser/api/password/BUILD.gn @@ -7,8 +7,6 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") source_set("password") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "brave_password_api+private.h", "brave_password_api.h", diff --git a/ios/browser/api/qr_code/BUILD.gn b/ios/browser/api/qr_code/BUILD.gn index c7b9682fdf1..68a762924ee 100644 --- a/ios/browser/api/qr_code/BUILD.gn +++ b/ios/browser/api/qr_code/BUILD.gn @@ -4,8 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("qr_code") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "qr_code_generator.h", "qr_code_generator.mm", diff --git a/ios/browser/api/query_filter/BUILD.gn b/ios/browser/api/query_filter/BUILD.gn index 8b1e764c3fd..c4231f175fb 100644 --- a/ios/browser/api/query_filter/BUILD.gn +++ b/ios/browser/api/query_filter/BUILD.gn @@ -4,8 +4,6 @@ # You can obtain one at https://mozilla.org/MPL/2.0/. source_set("query_filter") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "utils.h", "utils.mm", diff --git a/ios/browser/api/session_restore/BUILD.gn b/ios/browser/api/session_restore/BUILD.gn index 10fe66ab6e8..b182d9cf50b 100644 --- a/ios/browser/api/session_restore/BUILD.gn +++ b/ios/browser/api/session_restore/BUILD.gn @@ -4,8 +4,6 @@ # You can obtain one at https://mozilla.org/MPL/2.0/. source_set("session_restore") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "synthesized_session_restore.h", "synthesized_session_restore.mm", diff --git a/ios/browser/api/sync/BUILD.gn b/ios/browser/api/sync/BUILD.gn index 45e849b122b..bb2e53035f4 100644 --- a/ios/browser/api/sync/BUILD.gn +++ b/ios/browser/api/sync/BUILD.gn @@ -7,8 +7,6 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") source_set("sync") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "brave_sync_api.h", "brave_sync_api.mm", diff --git a/ios/browser/api/sync/driver/BUILD.gn b/ios/browser/api/sync/driver/BUILD.gn index a8f5cf278fc..fe0c9985d12 100644 --- a/ios/browser/api/sync/driver/BUILD.gn +++ b/ios/browser/api/sync/driver/BUILD.gn @@ -7,8 +7,6 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") source_set("driver") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "brave_sync_profile_service+private.h", "brave_sync_profile_service.h", diff --git a/ios/browser/api/url/BUILD.gn b/ios/browser/api/url/BUILD.gn index ff90e2d8d25..42fa5c4eb29 100644 --- a/ios/browser/api/url/BUILD.gn +++ b/ios/browser/api/url/BUILD.gn @@ -4,8 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("url") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "url_formatter.h", "url_formatter.mm", diff --git a/ios/browser/api/version_info/BUILD.gn b/ios/browser/api/version_info/BUILD.gn index 994d69252f0..f970db6c159 100644 --- a/ios/browser/api/version_info/BUILD.gn +++ b/ios/browser/api/version_info/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("version_info") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "version_info_ios.h", "version_info_ios.mm", diff --git a/ios/browser/api/web/BUILD.gn b/ios/browser/api/web/BUILD.gn index 18015fdf3fe..b35d72194ed 100644 --- a/ios/browser/api/web/BUILD.gn +++ b/ios/browser/api/web/BUILD.gn @@ -7,8 +7,6 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") source_set("web") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [] deps = [ "web_state" ] diff --git a/ios/browser/api/web/web_state/BUILD.gn b/ios/browser/api/web/web_state/BUILD.gn index e21400af27c..001de3ea73f 100644 --- a/ios/browser/api/web/web_state/BUILD.gn +++ b/ios/browser/api/web/web_state/BUILD.gn @@ -7,8 +7,6 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") source_set("web_state") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "web_state+private.h", "web_state.h", diff --git a/ios/browser/api/web_image/BUILD.gn b/ios/browser/api/web_image/BUILD.gn index 514b318f89b..2c5cdab879e 100644 --- a/ios/browser/api/web_image/BUILD.gn +++ b/ios/browser/api/web_image/BUILD.gn @@ -4,8 +4,6 @@ # You can obtain one at https://mozilla.org/MPL/2.0/. source_set("web_image") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "image_downloader.h", "image_downloader.mm", diff --git a/ios/browser/brave_wallet/BUILD.gn b/ios/browser/brave_wallet/BUILD.gn index d7907a623ed..a5e6e05554c 100644 --- a/ios/browser/brave_wallet/BUILD.gn +++ b/ios/browser/brave_wallet/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("brave_wallet") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "asset_ratio_service_factory.cc", "asset_ratio_service_factory.h", diff --git a/ios/browser/favicon/BUILD.gn b/ios/browser/favicon/BUILD.gn index 2f521cc1b29..1ad0d151f52 100644 --- a/ios/browser/favicon/BUILD.gn +++ b/ios/browser/favicon/BUILD.gn @@ -4,8 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("favicon") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "brave_ios_favicon_loader.h", "brave_ios_favicon_loader.mm", diff --git a/ios/browser/keyed_service/BUILD.gn b/ios/browser/keyed_service/BUILD.gn index 107aa08db76..505f4f7d354 100644 --- a/ios/browser/keyed_service/BUILD.gn +++ b/ios/browser/keyed_service/BUILD.gn @@ -9,7 +9,6 @@ config("external") { } source_set("keyed_service") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "keyed_service_factory_wrapper+private.h", "keyed_service_factory_wrapper.h", diff --git a/ios/browser/providers/lottie/BUILD.gn b/ios/browser/providers/lottie/BUILD.gn index c4de3bfbc3f..a71f568a17a 100644 --- a/ios/browser/providers/lottie/BUILD.gn +++ b/ios/browser/providers/lottie/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at https://mozilla.org/MPL/2.0/. source_set("chromium_lottie_animation") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "chromium_lottie_animation.mm" ] deps = [ "//ios/public/provider/chrome/browser/lottie:lottie_animation_api" ] } diff --git a/ios/browser/skus/BUILD.gn b/ios/browser/skus/BUILD.gn index 236728cfcca..a525ce9c6b8 100644 --- a/ios/browser/skus/BUILD.gn +++ b/ios/browser/skus/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. source_set("skus") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "skus_sdk_factory_wrappers.h", "skus_sdk_factory_wrappers.mm", diff --git a/ios/browser/svg/BUILD.gn b/ios/browser/svg/BUILD.gn index 636ba8bae26..88323398755 100644 --- a/ios/browser/svg/BUILD.gn +++ b/ios/browser/svg/BUILD.gn @@ -11,8 +11,6 @@ source_set("svg") { "-Wno-unreachable-code-aggressive", ] - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ "svg_image.h", "svg_image.mm", diff --git a/ios/testing/BUILD.gn b/ios/testing/BUILD.gn index f51ec53fa82..b06d26cde38 100644 --- a/ios/testing/BUILD.gn +++ b/ios/testing/BUILD.gn @@ -7,7 +7,6 @@ import("//build/config/ios/rules.gni") import("//testing/test.gni") ios_xctest_test("brave_core_ios_tests") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "dictionary_transform_test.mm", "main.mm", diff --git a/test/BUILD.gn b/test/BUILD.gn index ce7a97a107e..dcbc31a15f6 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -975,10 +975,6 @@ test("brave_browser_tests") { ] } - if (is_apple) { - configs += [ "//build/config/compiler:enable_arc" ] - } - if (use_aura) { deps += [ "//ui/aura:test_support" ] }