diff options
| author | dpranke <dpranke@chromium.org> | 2015-02-24 13:42:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-24 21:43:06 +0000 |
| commit | e2ef382dd208417056acbd579620a428fa1b7af4 (patch) | |
| tree | 70823f07fbe8a02bae915cec09aa5d2a3ab8fdc9 /third_party | |
| parent | 70857a1fbe037a8b3666af95ac843cea1585b024 (diff) | |
| download | chromium_src-e2ef382dd208417056acbd579620a428fa1b7af4.zip chromium_src-e2ef382dd208417056acbd579620a428fa1b7af4.tar.gz chromium_src-e2ef382dd208417056acbd579620a428fa1b7af4.tar.bz2 | |
Reland #317760 - add gn_all, gyp_all targets
In order to be able to make sure we are building the same list of targets
in both the GYP and GN builds, this patch adds new 'gn_all' and 'gyp_all'
targets.
Eventually, we should make sure that if one builds 'gn_all', then building
'gyp_all', 'All', or 'all' then has nothing to do. We're not there yet, but this
is a start.
The 'gn_all' target replaces the //:root target in the GN builds.
TBR=brettw@chromium.org
BUG=461019
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg
Review URL: https://codereview.chromium.org/953463003
Cr-Commit-Position: refs/heads/master@{#317893}
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libaddressinput/BUILD.gn | 13 | ||||
| -rw-r--r-- | third_party/libexif/BUILD.gn | 15 |
2 files changed, 23 insertions, 5 deletions
diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn index 0c92b5b..1307c71 100644 --- a/third_party/libaddressinput/BUILD.gn +++ b/third_party/libaddressinput/BUILD.gn @@ -24,6 +24,12 @@ libaddressinput_util_files = [ "src/cpp/src/util/string_util.cc", ] +config("no-newline-eof-warning") { + if (is_clang) { + cflags = [ "-Wno-newline-eof" ] + } +} + # GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings grit("strings") { source = "//chrome/app/address_input_strings.grd" @@ -85,6 +91,8 @@ grit("strings") { "address_input_strings_zh-CN.pak", "address_input_strings_zh-TW.pak", ] + + configs = [ ":no-newline-eof-warning" ] } config("libaddressinput_config") { @@ -109,7 +117,10 @@ static_library("util") { sources -= [ "src/cpp/src/util/json.cc" ] configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ + ":no-newline-eof-warning", + "//build/config/compiler:no_chromium_code", + ] public_configs = [ ":libaddressinput_config" ] diff --git a/third_party/libexif/BUILD.gn b/third_party/libexif/BUILD.gn index be8caf6..de9b2ef 100644 --- a/third_party/libexif/BUILD.gn +++ b/third_party/libexif/BUILD.gn @@ -4,10 +4,19 @@ # Linux should use system libexif if (!is_linux || is_chromeos) { - # TODO(thestig): Properly support building on Linux. config("libexif_config") { include_dirs = [ "sources" ] + if (is_clang) { + cflags = [ + "-Wno-enum-conversion", + "-Wno-switch", + "-Wno-format", + + # libexif uses fabs(int) to cast to float. + "-Wno-absolute-value", + ] + } } static_library("libexif") { @@ -51,9 +60,7 @@ if (!is_linux || is_chromeos) { ldflags = [ "/DEF:" + rebase_path("libexif.def") ] - cflags = [ - "/wd4018", # size/unsigned mismatch - ] + cflags = [ "/wd4018" ] # size/unsigned mismatch # TODO(GYP): Handle /analyze switch, when it will be used in GN. } else if (is_linux) { |