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 <avi@chromium.org> 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
This commit is contained in:
Claudio DeSouza
@@ -6,8 +6,6 @@
|
||||
assert(is_apple)
|
||||
|
||||
source_set("mac") {
|
||||
configs += [ "//build/config/compiler:enable_arc" ]
|
||||
|
||||
sources = [ "conversions.h" ]
|
||||
|
||||
frameworks = [ "Foundation.framework" ]
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -29,5 +29,4 @@ source_set("mac") {
|
||||
"NetworkExtension.framework",
|
||||
"Foundation.framework",
|
||||
]
|
||||
configs += [ "//build/config/compiler:enable_arc" ]
|
||||
}
|
||||
|
||||
@@ -40,7 +40,5 @@ component("browser") {
|
||||
"Foundation.framework",
|
||||
"Vision.framework",
|
||||
]
|
||||
|
||||
configs += [ "//build/config/compiler:enable_arc" ]
|
||||
}
|
||||
}
|
||||
|
||||
+1
-4
@@ -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",
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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" ]
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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" ]
|
||||
}
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -11,8 +11,6 @@ source_set("svg") {
|
||||
"-Wno-unreachable-code-aggressive",
|
||||
]
|
||||
|
||||
configs += [ "//build/config/compiler:enable_arc" ]
|
||||
|
||||
sources = [
|
||||
"svg_image.h",
|
||||
"svg_image.mm",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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" ]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user