Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 PDFium Authors. All rights reserved. | 1 # Copyright 2014 PDFium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("../pdfium.gni") | 5 import("../pdfium.gni") |
| 6 | 6 |
| 7 group("third_party") { | 7 group("third_party") { |
| 8 deps = [ | 8 deps = [ |
| 9 ":bigint", | 9 ":bigint", |
| 10 ":fx_freetype", | 10 ":fx_freetype", |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 321 "libpng16/pngstruct.h", | 321 "libpng16/pngstruct.h", |
| 322 "libpng16/pngtrans.c", | 322 "libpng16/pngtrans.c", |
| 323 "libpng16/pngwio.c", | 323 "libpng16/pngwio.c", |
| 324 "libpng16/pngwrite.c", | 324 "libpng16/pngwrite.c", |
| 325 "libpng16/pngwtran.c", | 325 "libpng16/pngwtran.c", |
| 326 "libpng16/pngwutil.c", | 326 "libpng16/pngwutil.c", |
| 327 ] | 327 ] |
| 328 } | 328 } |
| 329 | 329 |
| 330 if (pdf_enable_xfa) { | 330 if (pdf_enable_xfa) { |
| 331 config("fx_tiff_warnings") { | |
| 332 visibility = [ ":*" ] | |
| 333 if (is_win) { | |
| 334 cflags = [ | |
| 335 "/wd4005", # Macro redefinition for 'WIN32_LEAN_AND_MEAN'. | |
| 336 ] | |
| 337 } | |
| 338 } | |
| 339 source_set("fx_tiff") { | 331 source_set("fx_tiff") { |
| 340 configs -= [ "//build/config/compiler:chromium_code" ] | 332 configs -= [ "//build/config/compiler:chromium_code" ] |
| 341 configs += [ | 333 configs += [ |
| 342 "//build/config/compiler:no_chromium_code", | 334 "//build/config/compiler:no_chromium_code", |
| 343 "../:pdfium_config", | 335 "../:pdfium_config", |
| 344 | |
| 345 ":fx_tiff_warnings", | |
| 346 ] | 336 ] |
| 347 deps = [ | 337 deps = [ |
| 348 "//third_party:jpeg", | 338 "//third_party:jpeg", |
| 349 ] | 339 ] |
| 340 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
| |
| 341 # Need to undefine the macro since it is redefined in | |
| 342 # tif_ojpeg.c and tif_jpeg.c. | |
| 343 '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.
| |
| 344 ], | |
|
Lei Zhang
2016/05/09 21:43:54
No trailing comma.
Wei Li
2016/05/09 22:35:47
Acknowledged.
| |
| 350 sources = [ | 345 sources = [ |
| 351 "libtiff/tif_aux.c", | 346 "libtiff/tif_aux.c", |
| 352 "libtiff/tif_close.c", | 347 "libtiff/tif_close.c", |
| 353 "libtiff/tif_codec.c", | 348 "libtiff/tif_codec.c", |
| 354 "libtiff/tif_color.c", | 349 "libtiff/tif_color.c", |
| 355 "libtiff/tif_compress.c", | 350 "libtiff/tif_compress.c", |
| 356 "libtiff/tif_dir.c", | 351 "libtiff/tif_dir.c", |
| 357 "libtiff/tif_dirinfo.c", | 352 "libtiff/tif_dirinfo.c", |
| 358 "libtiff/tif_dirread.c", | 353 "libtiff/tif_dirread.c", |
| 359 "libtiff/tif_dirwrite.c", | 354 "libtiff/tif_dirwrite.c", |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 434 sources = [ | 429 sources = [ |
| 435 "base/logging.h", | 430 "base/logging.h", |
| 436 "base/macros.h", | 431 "base/macros.h", |
| 437 "base/numerics/safe_conversions.h", | 432 "base/numerics/safe_conversions.h", |
| 438 "base/numerics/safe_conversions_impl.h", | 433 "base/numerics/safe_conversions_impl.h", |
| 439 "base/numerics/safe_math.h", | 434 "base/numerics/safe_math.h", |
| 440 "base/numerics/safe_math_impl.h", | 435 "base/numerics/safe_math_impl.h", |
| 441 "base/stl_util.h", | 436 "base/stl_util.h", |
| 442 ] | 437 ] |
| 443 } | 438 } |
| OLD | NEW |