| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'visibility%': 'hidden', | 3 'visibility%': 'hidden', |
| 4 'library%': 'static_library', | 4 'library%': 'static_library', |
| 5 'component%': '', | 5 'component%': '', |
| 6 'want_separate_host_toolset': 0, | 6 'want_separate_host_toolset': 0, |
| 7 }, | 7 }, |
| 8 | 8 |
| 9 'conditions': [ | 9 'conditions': [ |
| 10 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ | 10 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
| 11 or OS=="netbsd"', { | 11 or OS=="netbsd" or OS=="android"', { |
| 12 'target_defaults': { | 12 'target_defaults': { |
| 13 'cflags': [ '-Wall', '-W', '-Wno-unused-parameter', | 13 'cflags': [ '-Wall', '-W', '-Wno-unused-parameter', |
| 14 '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', | 14 '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', |
| 15 '-pedantic', | 15 '-pedantic', '-std=c++0x', '-fexceptions', ], |
| 16 # Ignore some warnings for googletest | |
| 17 '-Wno-error=long-long', '-Wno-error=variadic-macros', | |
| 18 '-Wno-error=missing-field-initializers' ], | |
| 19 'ldflags': [ '-pthread', ], | 16 'ldflags': [ '-pthread', ], |
| 20 }, | 17 }, |
| 21 }], | 18 }], |
| 19 ['OS=="android"', { |
| 20 'target_defaults': { |
| 21 'cflags!': [ |
| 22 '-pthread', # Not supported by Android toolchain. |
| 23 ], |
| 24 'ldflags!': [ |
| 25 '-pthread', # Not supported by Android toolchain. |
| 26 ], |
| 27 }, |
| 28 }], |
| 22 ], | 29 ], |
| 23 | 30 |
| 24 'target_defaults': { | 31 'target_defaults': { |
| 25 'msvs_cygwin_shell': 0, | 32 'msvs_cygwin_shell': 0, |
| 26 } | 33 } |
| 27 } | 34 } |
| OLD | NEW |