Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: sdch/BUILD.gn

Issue 1316843006: Revert of Un-nest configs in GN files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/secondary/testing/gtest/BUILD.gn ('k') | third_party/brotli/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdch/BUILD.gn
diff --git a/sdch/BUILD.gn b/sdch/BUILD.gn
index 4c6c5205cb067f0b953c42e4b6c6a24b46795c2f..6121dfc25b30621f107e10720e934ce5e78a3f2a 100644
--- a/sdch/BUILD.gn
+++ b/sdch/BUILD.gn
@@ -4,17 +4,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") {
@@ -53,13 +42,24 @@
"open-vcdiff/vsprojects/stdint.h",
]
- configs += [ ":sdch_warnings" ]
public_configs = [ ":sdch_config" ]
deps = [
"//base",
"//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" ]
« no previous file with comments | « build/secondary/testing/gtest/BUILD.gn ('k') | third_party/brotli/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698