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

Side by Side Diff: pdfium.gyp

Issue 1421963005: Merge to XFA: The chromium_code whack-a-mole CLs. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « core/src/fxge/win32/fx_win32_print.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 # TODO(thakis): Enable this, pdfium:29
4 #'chromium_code': 1,
3 'pdf_use_skia%': 0, 5 'pdf_use_skia%': 0,
4 'pdf_enable_v8%': 1, 6 'pdf_enable_v8%': 1,
5 'pdf_enable_xfa%': 1, 7 'pdf_enable_xfa%': 1,
6 'conditions': [ 8 'conditions': [
7 ['OS=="linux"', { 9 ['OS=="linux"', {
8 'bundle_freetype%': 0, 10 'bundle_freetype%': 0,
9 }, { # On Android there's no system FreeType. On Windows and Mac, only a 11 }, { # On Android there's no system FreeType. On Windows and Mac, only a
10 # few methods are used from it. 12 # few methods are used from it.
11 'bundle_freetype%': 1, 13 'bundle_freetype%': 1,
12 }], 14 }],
(...skipping 28 matching lines...) Expand all
41 'defines' : [ '_FX_CPU_=_FX_X64_', ], 43 'defines' : [ '_FX_CPU_=_FX_X64_', ],
42 'cflags': [ '-fPIC', ], 44 'cflags': [ '-fPIC', ],
43 }], 45 }],
44 ['target_arch=="ia32"', { 46 ['target_arch=="ia32"', {
45 'defines' : [ '_FX_CPU_=_FX_X86_', ], 47 'defines' : [ '_FX_CPU_=_FX_X86_', ],
46 }], 48 }],
47 ], 49 ],
48 }], 50 }],
49 ], 51 ],
50 'msvs_disabled_warnings': [ 52 'msvs_disabled_warnings': [
51 4005, 4018, 4146, 4333, 4345, 4267 53 4005, 4018, 4146, 4333, 4345, 4267,
54 # TODO(thestig): Fix all instances, remove this, pdfium:29
55 4245, 4310, 4389, 4701, 4702, 4706, 4800,
52 ], 56 ],
57 'variables': {
58 'clang_warning_flags': [
59 # TODO(thestig): Fix all instances, remove this, pdfium:29
60 '-Wno-sign-compare',
61 ],
62 # Make sure Chromium's build/common.gypi doesn't re-add the flag on linux.
63 'cflags_cc!': [ '-Wsign-compare' ],
64 },
53 }, 65 },
54 'targets': [ 66 'targets': [
55 { 67 {
56 'target_name': 'pdfium', 68 'target_name': 'pdfium',
57 'type': 'static_library', 69 'type': 'static_library',
58 'dependencies': [ 70 'dependencies': [
59 'third_party/third_party.gyp:bigint', 71 'third_party/third_party.gyp:bigint',
60 'third_party/third_party.gyp:pdfium_base', 72 'third_party/third_party.gyp:pdfium_base',
61 'fdrm', 73 'fdrm',
62 'fpdfdoc', 74 'fpdfdoc',
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 ], 855 ],
844 'dependencies': [ 856 'dependencies': [
845 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 857 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
846 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform', 858 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform',
847 ], 859 ],
848 }], 860 }],
849 ], 861 ],
850 }, 862 },
851 ], 863 ],
852 } 864 }
OLDNEW
« no previous file with comments | « core/src/fxge/win32/fx_win32_print.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698