diff options
| author | brettw <brettw@chromium.org> | 2015-02-19 15:17:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-19 23:18:14 +0000 |
| commit | d1c719acf7db459016f425eb8018ec4208511578 (patch) | |
| tree | f5604ba0055245c0133cd5747e8a70de99b917f7 /third_party/libpng | |
| parent | 9ff250e0023b2f87e0fddd7eadbef7be3ecc3882 (diff) | |
| download | chromium_src-d1c719acf7db459016f425eb8018ec4208511578.zip chromium_src-d1c719acf7db459016f425eb8018ec4208511578.tar.gz chromium_src-d1c719acf7db459016f425eb8018ec4208511578.tar.bz2 | |
Update existing uses of /wd4267 to use the GN config
This is the size_t to integer conversion warning. Using the config prevents flag duplication and is clearer to read.
Minor updates to Win64 build, including some fixes for size_t to int conversions.
Review URL: https://codereview.chromium.org/929793006
Cr-Commit-Position: refs/heads/master@{#317162}
Diffstat (limited to 'third_party/libpng')
| -rw-r--r-- | third_party/libpng/BUILD.gn | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/third_party/libpng/BUILD.gn b/third_party/libpng/BUILD.gn index 488ef43..787d4fa 100644 --- a/third_party/libpng/BUILD.gn +++ b/third_party/libpng/BUILD.gn @@ -52,12 +52,8 @@ source_set("libpng_sources") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - if (is_win) { - cflags = [ "/wd4267" ] # TODO(jschuh): http://crbug.com/167187 - - if (component_mode == "shared_library") { - defines = [ "PNG_BUILD_DLL" ] - } + if (is_win && is_component_build) { + defines = [ "PNG_BUILD_DLL" ] } public_configs = [ ":libpng_config" ] |