summaryrefslogtreecommitdiffstats
path: root/sdch/BUILD.gn
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-09-01 11:30:18 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-01 18:30:50 +0000
commit0cb5abbf230f3c30e3499d4e787f059ed723dd3c (patch)
treeaee18f03c7d7aec2938243bf5cd1b8d9b491a98f /sdch/BUILD.gn
parentb6964e616848f11aa1dc6f9ac0a57e2d8d1dac98 (diff)
downloadchromium_src-0cb5abbf230f3c30e3499d4e787f059ed723dd3c.zip
chromium_src-0cb5abbf230f3c30e3499d4e787f059ed723dd3c.tar.gz
chromium_src-0cb5abbf230f3c30e3499d4e787f059ed723dd3c.tar.bz2
Revert of Un-nest configs in GN files. (patchset #3 id:40001 of https://codereview.chromium.org/1318823008/ )
Reason for revert: This breaks why these configs exist in the first place and seriously breaks the clang/win gn build (which is what these configs exist for). Original issue's description: > Un-nest configs in GN files. > > People sometimes nest targets or configs, usually with the assumption that this limits the visibility of a config to within a target. But this nesting provides no visibility restrictions over declaring it outside of a block. > > Un-nest for clarity. > > Committed: https://crrev.com/4af2eac8e84692d94f88504ab6e0b244b88dddcb > Cr-Commit-Position: refs/heads/master@{#346461} TBR=dpranke@chromium.org,brettw@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1316843006 Cr-Commit-Position: refs/heads/master@{#346695}
Diffstat (limited to 'sdch/BUILD.gn')
-rw-r--r--sdch/BUILD.gn24
1 files changed, 12 insertions, 12 deletions
diff --git a/sdch/BUILD.gn b/sdch/BUILD.gn
index 4c6c520..6121dfc 100644
--- a/sdch/BUILD.gn
+++ b/sdch/BUILD.gn
@@ -6,17 +6,6 @@ config("sdch_config") {
include_dirs = [ "open-vcdiff/src" ]
}
-# gn orders flags on a target before flags from configs. The default config
-# adds -Wall, and these flags have to be after -Wall -- so they need to come
-# from a config and can't be on the target directly.
-config("sdch_warnings") {
- cflags = []
- if (is_linux) {
- # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11:
- cflags += [ "-Wno-deprecated-declarations" ]
- }
-}
-
static_library("sdch") {
sources = [
"logging_forward.h",
@@ -53,7 +42,6 @@ static_library("sdch") {
"open-vcdiff/vsprojects/stdint.h",
]
- configs += [ ":sdch_warnings" ]
public_configs = [ ":sdch_config" ]
deps = [
@@ -61,6 +49,18 @@ static_library("sdch") {
"//third_party/zlib",
]
+ # gn orders flags on a target before flags from configs. The default config
+ # adds -Wall, and these flags have to be after -Wall -- so they need to come
+ # from a config and can't be on the target directly.
+ config("sdch_warnings") {
+ cflags = []
+ if (is_linux) {
+ # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11:
+ cflags += [ "-Wno-deprecated-declarations" ]
+ }
+ }
+ configs += [ ":sdch_warnings" ]
+
if (is_linux || is_android) {
include_dirs = [ "linux" ]
} else if (is_ios) {