diff options
| author |  mtklein <mtklein@chromium.org> | 2016-07-19 08:25:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-19 08:25:00 -0700 |
| commit | f037d48e29000554abcd117445c4249071bb9fb3 (patch) | |
| tree | 8492f6981c971f486cf29958620604aa6bcb2275 /third_party/BUILD.gn | |
| parent | 916e02a6d004af5b83a636d1507bfdf2da8543ce (diff) | |
GN: refactor third_party/gni
This fixes the build on Linux (dep on third_party:zlib -> third_party/zlib).
I've moved declare_args() {} back to each .gn file... seems like args want
to be as local as possible in GN land.
Additionally, refactor all the common third_party config and warning flag
changes into a template, third_party. This lets it all live together in a
.gni: at head unwanted_configs can be in a .gni (it's just a variable) but
config("no_warnings") (and thus third_party_configs) cannot, as configs
cannot be part of .gni files.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2163653002
Review-Url: https://codereview.chromium.org/2163653002
Diffstat (limited to 'third_party/BUILD.gn')
| -rw-r--r-- | third_party/BUILD.gn | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 96837d2b3a..1aca3ca9cb 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -3,24 +3,19 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("third_party.gni") - -# Most third_party code should disable warnings: if we don't maintain the code, warnings are noise. -config("no_warnings") { - cflags = [ "-w" ] +declare_args() { } -third_party_configs = [ ":no_warnings" ] + +import("third_party.gni") config("libpng_public") { include_dirs = [ "libpng" ] } -source_set("libpng") { +third_party("libpng") { public_configs = [ ":libpng_public" ] - configs += third_party_configs - configs -= unwanted_configs deps = [ - ":zlib", + "//third_party/zlib", ] sources = [ "libpng/png.c", @@ -44,10 +39,8 @@ source_set("libpng") { config("libjpeg-turbo_config") { include_dirs = [ "externals/libjpeg-turbo" ] } -source_set("libjpeg-turbo") { +third_party("libjpeg-turbo") { public_configs = [ ":libjpeg-turbo_config" ] - configs += third_party_configs - configs -= unwanted_configs sources = [ "externals/libjpeg-turbo/jcapimin.c", |