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

Side by Side Diff: pdfium.gyp

Issue 1431563002: chromium_code tweaks for Windows and Linux/gyp. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
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 | « BUILD.gn ('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 'chromium_code': 1, 3 'chromium_code': 1,
4 'pdf_use_skia%': 0, 4 'pdf_use_skia%': 0,
5 'pdf_enable_v8%': 1, 5 'pdf_enable_v8%': 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 23 matching lines...) Expand all
34 'defines' : [ '_FX_CPU_=_FX_X64_', ], 34 'defines' : [ '_FX_CPU_=_FX_X64_', ],
35 'cflags': [ '-fPIC', ], 35 'cflags': [ '-fPIC', ],
36 }], 36 }],
37 ['target_arch=="ia32"', { 37 ['target_arch=="ia32"', {
38 'defines' : [ '_FX_CPU_=_FX_X86_', ], 38 'defines' : [ '_FX_CPU_=_FX_X86_', ],
39 }], 39 }],
40 ], 40 ],
41 }], 41 }],
42 ], 42 ],
43 'msvs_disabled_warnings': [ 43 'msvs_disabled_warnings': [
44 4005, 4018, 4146, 4333, 4345, 4267 44 4005, 4018, 4146, 4333, 4345, 4267,
45 # TODO(thestig): Fix all instances, remove this, pdfium:29
46 4245, 4389, 4701, 4706, 4800,
45 ], 47 ],
46 'variables': { 48 'variables': {
47 'clang_warning_flags': [ 49 'clang_warning_flags': [
48 # TODO(thestig): Fix all instances, remove this, pdfium:29 50 # TODO(thestig): Fix all instances, remove this, pdfium:29
49 '-Wno-sign-compare', 51 '-Wno-sign-compare',
50 ], 52 ],
53 # Make sure build/common.gypi doesn't re-add the flag on linux.
Lei Zhang 2015/10/30 18:57:32 "Make sure Chromium's build/common.gypi"
Nico 2015/10/30 19:09:31 (done, btw)
54 'cflags_cc!': [ '-Wsign-compare' ],
51 }, 55 },
52 }, 56 },
53 'targets': [ 57 'targets': [
54 { 58 {
55 'target_name': 'pdfium', 59 'target_name': 'pdfium',
56 'type': 'static_library', 60 'type': 'static_library',
57 'dependencies': [ 61 'dependencies': [
58 'third_party/third_party.gyp:bigint', 62 'third_party/third_party.gyp:bigint',
59 'third_party/third_party.gyp:pdfium_base', 63 'third_party/third_party.gyp:pdfium_base',
60 'fdrm', 64 'fdrm',
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 ], 792 ],
789 'dependencies': [ 793 'dependencies': [
790 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 794 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
791 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform', 795 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform',
792 ], 796 ],
793 }], 797 }],
794 ], 798 ],
795 }, 799 },
796 ], 800 ],
797 } 801 }
OLDNEW
« no previous file with comments | « BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698