Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'pdf_use_skia%': 0, | 3 'pdf_use_skia%': 0, |
| 4 'pdf_enable_v8%': 1, | 4 'pdf_enable_v8%': 1, |
| 5 'pdf_enable_xfa%': 1, | 5 'pdf_enable_xfa%': 1, |
| 6 'conditions': [ | 6 'conditions': [ |
| 7 ['OS=="linux"', { | 7 ['OS=="linux"', { |
| 8 'bundle_freetype%': 0, | 8 'bundle_freetype%': 0, |
| 9 }, { # On Android there's no system FreeType. On Windows and Mac, only a | 9 }, { # On Android there's no system FreeType. On Windows and Mac, only a |
| 10 # few methods are used from it. | 10 # few methods are used from it. |
| (...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 527 'core/src/fxge/ge/fx_ge.cpp', | 527 'core/src/fxge/ge/fx_ge.cpp', |
| 528 'core/src/fxge/ge/fx_ge_device.cpp', | 528 'core/src/fxge/ge/fx_ge_device.cpp', |
| 529 'core/src/fxge/ge/fx_ge_font.cpp', | 529 'core/src/fxge/ge/fx_ge_font.cpp', |
| 530 'core/src/fxge/ge/fx_ge_fontmap.cpp', | 530 'core/src/fxge/ge/fx_ge_fontmap.cpp', |
| 531 'core/src/fxge/ge/fx_ge_linux.cpp', | 531 'core/src/fxge/ge/fx_ge_linux.cpp', |
| 532 'core/src/fxge/ge/fx_ge_path.cpp', | 532 'core/src/fxge/ge/fx_ge_path.cpp', |
| 533 'core/src/fxge/ge/fx_ge_ps.cpp', | 533 'core/src/fxge/ge/fx_ge_ps.cpp', |
| 534 'core/src/fxge/ge/fx_ge_text.cpp', | 534 'core/src/fxge/ge/fx_ge_text.cpp', |
| 535 'core/src/fxge/ge/text_int.h', | 535 'core/src/fxge/ge/text_int.h', |
| 536 ], | 536 ], |
| 537 'variables': { | |
| 538 'clang_warning_flags': [ | |
| 539 # http://code.google.com/p/pdfium/issues/detail?id=188 | |
| 540 '-Wno-switch', | |
| 541 ], | |
| 542 }, | |
| 537 'conditions': [ | 543 'conditions': [ |
| 538 ['pdf_use_skia==1', { | 544 ['pdf_use_skia==1', { |
| 539 'sources': [ | 545 'sources': [ |
| 540 'core/src/fxge/skia/fx_skia_blitter_new.cpp', | 546 'core/src/fxge/skia/fx_skia_blitter_new.cpp', |
| 541 'core/src/fxge/skia/fx_skia_device.cpp', | 547 'core/src/fxge/skia/fx_skia_device.cpp', |
| 542 ], | 548 ], |
| 543 'dependencies': [ | 549 'dependencies': [ |
| 544 '<(DEPTH)/skia/skia.gyp:skia', | 550 '<(DEPTH)/skia/skia.gyp:skia', |
| 545 ], | 551 ], |
| 546 'include_dirs': [ | 552 'include_dirs': [ |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 763 ], | 769 ], |
| 764 'include_dirs': [ | 770 'include_dirs': [ |
| 765 '<(DEPTH)' | 771 '<(DEPTH)' |
| 766 ], | 772 ], |
| 767 'sources': [ | 773 'sources': [ |
| 768 'core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp', | 774 'core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp', |
| 769 'core/src/fxcrt/fx_basic_bstring_unittest.cpp', | 775 'core/src/fxcrt/fx_basic_bstring_unittest.cpp', |
| 770 'core/src/fxcrt/fx_basic_memmgr_unittest.cpp', | 776 'core/src/fxcrt/fx_basic_memmgr_unittest.cpp', |
| 771 'core/src/fxcrt/fx_basic_wstring_unittest.cpp', | 777 'core/src/fxcrt/fx_basic_wstring_unittest.cpp', |
| 772 'core/src/fxcrt/fx_system_unittest.cpp', | 778 'core/src/fxcrt/fx_system_unittest.cpp', |
| 779 'testing/fx_string_testhelpers.h', | |
|
Lei Zhang
2015/10/22 20:42:30
eh? .cpp before .h.
dsinclair
2015/10/22 20:44:49
I made this match master, looks like master is als
| |
| 773 'testing/fx_string_testhelpers.cpp', | 780 'testing/fx_string_testhelpers.cpp', |
| 774 'testing/fx_string_testhelpers.h', | |
| 775 'third_party/base/nonstd_unique_ptr_unittest.cpp', | 781 'third_party/base/nonstd_unique_ptr_unittest.cpp', |
| 776 ], | 782 ], |
| 777 'conditions': [ | 783 'conditions': [ |
| 778 ['pdf_enable_xfa==1', { | 784 ['pdf_enable_xfa==1', { |
| 779 'sources': [ | 785 'sources': [ |
| 780 'xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp', | 786 'xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp', |
| 781 'xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp', | 787 'xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp', |
| 782 ], | 788 ], |
| 783 }], | 789 }], |
| 784 ], | 790 ], |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 850 ], | 856 ], |
| 851 'dependencies': [ | 857 'dependencies': [ |
| 852 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', | 858 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', |
| 853 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform', | 859 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform', |
| 854 ], | 860 ], |
| 855 }], | 861 }], |
| 856 ], | 862 ], |
| 857 }, | 863 }, |
| 858 ], | 864 ], |
| 859 } | 865 } |
| OLD | NEW |