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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libpng/BUILD.gn

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « third_party/jstemplate/jstemplate.js ('k') | third_party/ots/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libpng/BUILD.gn
diff --git a/third_party/libpng/BUILD.gn b/third_party/libpng/BUILD.gn
index 787d4fa7d00ecb3b5e0dd237dd4cec24aa5d5a0e..488ef4367f8264762257ce5bc8906cc48a2ecfac 100644
--- a/third_party/libpng/BUILD.gn
+++ b/third_party/libpng/BUILD.gn
@@ -52,8 +52,12 @@ source_set("libpng_sources") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
- if (is_win && is_component_build) {
- defines = [ "PNG_BUILD_DLL" ]
+ if (is_win) {
+ cflags = [ "/wd4267" ] # TODO(jschuh): http://crbug.com/167187
+
+ if (component_mode == "shared_library") {
+ defines = [ "PNG_BUILD_DLL" ]
+ }
}
public_configs = [ ":libpng_config" ]
« no previous file with comments | « third_party/jstemplate/jstemplate.js ('k') | third_party/ots/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698