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

Unified Diff: third_party/BUILD.gn

Issue 1962863002: Make GYP and GN build consistent for third_party targets (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | third_party/third_party.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/BUILD.gn
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 1176e9287534b525ab73b0a7995f08ee5c1a7b96..a6319fb955678a1918060049a36980ae171a04b8 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -328,25 +328,20 @@ source_set("fx_lpng") {
}
if (pdf_enable_xfa) {
- config("fx_tiff_warnings") {
- visibility = [ ":*" ]
- if (is_win) {
- cflags = [
- "/wd4005", # Macro redefinition for 'WIN32_LEAN_AND_MEAN'.
- ]
- }
- }
source_set("fx_tiff") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
"../:pdfium_config",
-
- ":fx_tiff_warnings",
]
deps = [
"//third_party:jpeg",
]
+ defines -= [
Lei Zhang 2016/05/09 21:03:22 The third_party.gyp version has this inside an OS=
Wei Li 2016/05/09 21:33:22 Sure, changed the gyp file as the condition is not
Lei Zhang 2016/05/09 21:43:54 I should also mention this doesn't work in GN: Ge
Wei Li 2016/05/09 22:35:47 Turns out the condition is still needed. Changed t
+ # Need to undefine the macro since it is redefined in
+ # tif_ojpeg.c and tif_jpeg.c.
+ 'WIN32_LEAN_AND_MEAN',
Lei Zhang 2016/05/09 21:43:54 Needs to be double quotes.
Wei Li 2016/05/09 22:35:47 Acknowledged.
+ ],
Lei Zhang 2016/05/09 21:43:54 No trailing comma.
Wei Li 2016/05/09 22:35:47 Acknowledged.
sources = [
"libtiff/tif_aux.c",
"libtiff/tif_close.c",
« no previous file with comments | « no previous file | third_party/third_party.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698