diff options
author | hiroshige <hiroshige@chromium.org> | 2015-02-23 23:54:06 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-24 07:54:29 +0000 |
commit | e6d374cf7ead69b3ff110f9d7dfba0dee921e6b7 (patch) | |
tree | e23bc296abe16faa3f2b5f96c918689f3929b261 /third_party/libaddressinput/BUILD.gn | |
parent | 57b85942d40ea1e9fe0d933434392bc67b23e8a3 (diff) | |
download | chromium_src-e6d374cf7ead69b3ff110f9d7dfba0dee921e6b7.zip chromium_src-e6d374cf7ead69b3ff110f9d7dfba0dee921e6b7.tar.gz chromium_src-e6d374cf7ead69b3ff110f9d7dfba0dee921e6b7.tar.bz2 |
Revert of add gn_all, gyp_all targets to build files, remove GN's //:root (patchset #18 id:350001 of https://codereview.chromium.org/936193004/)
Reason for revert:
Suspecting this breaks Mac builds.
http://build.chromium.org/p/chromium/builders/Mac/builds/33993
Original issue's description:
> add gn_all, gyp_all targets to the build files, remove GN's //:root
>
> 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.
>
> R=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
>
> Committed: https://crrev.com/ff30e3de333305ccdaa103aa7f9e46765da83e99
> Cr-Commit-Position: refs/heads/master@{#317760}
TBR=brettw@chromium.org,dpranke@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=461019
Review URL: https://codereview.chromium.org/944573003
Cr-Commit-Position: refs/heads/master@{#317763}
Diffstat (limited to 'third_party/libaddressinput/BUILD.gn')
-rw-r--r-- | third_party/libaddressinput/BUILD.gn | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn index 1307c71..0c92b5b 100644 --- a/third_party/libaddressinput/BUILD.gn +++ b/third_party/libaddressinput/BUILD.gn @@ -24,12 +24,6 @@ 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" @@ -91,8 +85,6 @@ grit("strings") { "address_input_strings_zh-CN.pak", "address_input_strings_zh-TW.pak", ] - - configs = [ ":no-newline-eof-warning" ] } config("libaddressinput_config") { @@ -117,10 +109,7 @@ static_library("util") { sources -= [ "src/cpp/src/util/json.cc" ] configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ - ":no-newline-eof-warning", - "//build/config/compiler:no_chromium_code", - ] + configs += [ "//build/config/compiler:no_chromium_code" ] public_configs = [ ":libaddressinput_config" ] |