| OLD | NEW |
| 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 25 matching lines...) Expand all Loading... |
| 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 | 45 # TODO(thestig): Fix all instances, remove this, pdfium:29 |
| 46 4245, 4389, 4701, 4706, 4800, | 46 4245, 4310, 4389, 4701, 4702, 4706, 4800, |
| 47 ], | 47 ], |
| 48 'variables': { | 48 'variables': { |
| 49 'clang_warning_flags': [ | 49 'clang_warning_flags': [ |
| 50 # TODO(thestig): Fix all instances, remove this, pdfium:29 | 50 # TODO(thestig): Fix all instances, remove this, pdfium:29 |
| 51 '-Wno-sign-compare', | 51 '-Wno-sign-compare', |
| 52 ], | 52 ], |
| 53 # Make sure Chromium's build/common.gypi doesn't re-add the flag on linux. | 53 # Make sure Chromium's build/common.gypi doesn't re-add the flag on linux. |
| 54 'cflags_cc!': [ '-Wsign-compare' ], | 54 'cflags_cc!': [ '-Wsign-compare' ], |
| 55 }, | 55 }, |
| 56 }, | 56 }, |
| (...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 792 ], | 792 ], |
| 793 'dependencies': [ | 793 'dependencies': [ |
| 794 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', | 794 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', |
| 795 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform', | 795 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform', |
| 796 ], | 796 ], |
| 797 }], | 797 }], |
| 798 ], | 798 ], |
| 799 }, | 799 }, |
| 800 ], | 800 ], |
| 801 } | 801 } |
| OLD | NEW |