| OLD | NEW | 
|   1 { |   1 { | 
|   2   'variables': { |   2   'variables': { | 
 |   3     'component%': 'static_library', | 
|   3     'visibility%': 'hidden', |   4     'visibility%': 'hidden', | 
|   4     'library%': 'static_library', |   5     'library%': 'static_library', | 
|   5     'component%': '', |  | 
|   6     'want_separate_host_toolset': 0, |  | 
|   7     'v8_optimized_debug': 0, |  | 
|   8     'v8_enable_i18n_support': 0, |  | 
|   9   }, |   6   }, | 
|  10  |   7  | 
|  11   'conditions': [ |   8   'conditions': [ | 
|  12     ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |   9     ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ | 
|  13        or OS=="netbsd" or OS=="android"', { |  10        or OS=="netbsd" or OS=="android"', { | 
|  14       'target_defaults': { |  11       'target_defaults': { | 
 |  12         'cflags': [ '-pthread' ], | 
|  15         # V8 headers cause a build error on recent gcc. |  13         # V8 headers cause a build error on recent gcc. | 
|  16         # Adding -fpermissive to solve this. |  14         # Adding -fpermissive to solve this. | 
|  17         # See https://issues.adblockplus.org/ticket/4950 |  15         # See https://issues.adblockplus.org/ticket/4950 | 
|  18         # We might be able to do without after upgrading V8. |  16         # We might be able to do without after upgrading V8. | 
|  19         'cflags': [ '-Wall', '-W', '-Wno-unused-parameter', |  17         'cflags_cc': [ '-fno-rtti', '-std=c++11', '-fexceptions', '-fpermissive'
     ], | 
|  20                     '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', |  | 
|  21                     '-pedantic', '-std=c++0x', '-fexceptions', '-fpermissive' ], |  | 
|  22         'cflags!': [ '-Werror', ], |  18         'cflags!': [ '-Werror', ], | 
|  23         'ldflags': [ '-pthread', ], |  19         'ldflags': [ '-pthread', ], | 
|  24       }, |  20       }, | 
|  25     }], |  21     }], | 
|  26     ['OS=="mac"', { |  22     ['OS=="mac"', { | 
|  27       'xcode_settings': { |  23       'xcode_settings': { | 
|  28         'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', |  24         'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', | 
|  29         'CLANG_CXX_LIBRARY': 'libc++', |  25         'CLANG_CXX_LIBRARY': 'libc++', | 
|  30         'OTHER_CPLUSPLUSFLAGS' : ['-std=c++11', '-stdlib=libc++'], |  | 
|  31       }, |  26       }, | 
|  32     }], |  27     }], | 
|  33     ['OS=="android"', { |  28   ], | 
 |  29   'target_conditions': [ | 
 |  30     ['OS=="android" and not "host" in toolsets', { | 
|  34       'target_defaults': { |  31       'target_defaults': { | 
|  35         'cflags!': [ |  32         'cflags!': [ | 
|  36           '-pthread',  # Not supported by Android toolchain. |  33           '-pthread',  # Not fully supported by Android toolchain. Built-in supo
    rt of major functions, no need to link with it. | 
|  37         ], |  34         ], | 
|  38         'ldflags!': [ |  35         'ldflags!': [ | 
|  39           '-pthread',  # Not supported by Android toolchain. |  36           '-llog' | 
 |  37           '-pthread',  # Not fully supported by Android toolchain. Built-in supo
    rt of major functions, no need to link with it. | 
|  40         ], |  38         ], | 
|  41       }, |  39       }, | 
|  42     }], |  40     }], | 
|  43   ], |  41   ], | 
|  44  |  42  | 
|  45   'target_defaults': { |  43   'target_defaults': { | 
 |  44     'configurations': { | 
 |  45       'Debug': {}, | 
 |  46       'Release': {} | 
 |  47     }, | 
|  46     'msvs_cygwin_shell': 0, |  48     'msvs_cygwin_shell': 0, | 
|  47     'target_conditions': [[ |  49     'target_conditions': [ | 
|  48       'OS=="mac" and _type=="executable"', { |  50       ['_type=="static_library"', { | 
|  49         'xcode_settings': { |  51         'standalone_static_library': 1 | 
|  50           'OTHER_LDFLAGS': ['-stdlib=libc++'], |  52       }] | 
|  51         }, |  53     ] | 
|  52       } |  | 
|  53     ]], |  | 
|  54   } |  54   } | 
|  55 } |  55 } | 
| OLD | NEW |