summaryrefslogtreecommitdiffstats
path: root/ios
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2016-03-17 03:25:44 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-17 10:26:36 +0000
commit2461a73bb77217ef3bbb35a3f32ab5e73eae640b (patch)
tree31a60b30f089cd39f7dced6d320145ba5e528690 /ios
parentfe0e7d280a97e68f43f5c66beaf4521030572912 (diff)
downloadchromium_src-2461a73bb77217ef3bbb35a3f32ab5e73eae640b.zip
chromium_src-2461a73bb77217ef3bbb35a3f32ab5e73eae640b.tar.gz
chromium_src-2461a73bb77217ef3bbb35a3f32ab5e73eae640b.tar.bz2
Add config to enable ARC on iOS/OS X to //build/config.
Add a new config //build/config/compiler:enable_arc that adds the required flag to enable ARC (automatic reference counting). BUG=594519 Review URL: https://codereview.chromium.org/1806513002 Cr-Commit-Position: refs/heads/master@{#381686}
Diffstat (limited to 'ios')
-rw-r--r--ios/third_party/gcdwebserver/BUILD.gn13
-rw-r--r--ios/third_party/ochamcrest/BUILD.gn13
2 files changed, 12 insertions, 14 deletions
diff --git a/ios/third_party/gcdwebserver/BUILD.gn b/ios/third_party/gcdwebserver/BUILD.gn
index 21b993c..5207f75 100644
--- a/ios/third_party/gcdwebserver/BUILD.gn
+++ b/ios/third_party/gcdwebserver/BUILD.gn
@@ -2,7 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-config("public_config") {
+config("config") {
+ visibility = [ ":gcdwebserver" ]
libs = [
"CFNetwork.framework",
"MobileCoreServices.framework",
@@ -16,14 +17,13 @@ config("public_config") {
]
}
-config("internal_config") {
+config("private_config") {
visibility = [ ":gcdwebserver" ]
# TODO(crbug.com/569158): Suppresses warnings that are treated as errors
# when minimum iOS version support is increased to iOS 9 and up.
# This should be removed once all deprecation violations have been fixed.
cflags = [ "-Wno-deprecated-declarations" ]
- cflags_objc = [ "-fobjc-arc" ]
}
source_set("gcdwebserver") {
@@ -60,6 +60,9 @@ source_set("gcdwebserver") {
"src/GCDWebServer/Responses/GCDWebServerStreamedResponse.m",
]
- public_configs = [ ":public_config" ]
- configs += [ ":internal_config" ]
+ public_configs = [ ":config" ]
+ configs += [
+ ":private_config",
+ "//build/config/compiler:enable_arc",
+ ]
}
diff --git a/ios/third_party/ochamcrest/BUILD.gn b/ios/third_party/ochamcrest/BUILD.gn
index 527e5f2..47f6135 100644
--- a/ios/third_party/ochamcrest/BUILD.gn
+++ b/ios/third_party/ochamcrest/BUILD.gn
@@ -175,25 +175,20 @@ copy("ochamcrest_copy_files") {
]
}
-config("ochamcrest_config") {
+config("config") {
visibility = [ ":ochamcrest" ]
libs = [ "XCTest.framework" ]
include_dirs = [ "$root_gen_dir/ios/third_party/ochamcrest" ]
}
-config("ochamcrest_private_config") {
- visibility = [ ":ochamcrest" ]
- cflags_objc = [ "-fobjc-arc" ]
-}
-
source_set("ochamcrest") {
testonly = true
configs += [
- ":ochamcrest_config",
- ":ochamcrest_private_config",
+ ":config",
+ "//build/config/compiler:enable_arc",
"//build/config/compiler:no_chromium_code",
]
- public_configs = [ ":ochamcrest_config" ]
+ public_configs = [ ":config" ]
public_deps = [
":ochamcrest_copy_files",
]