| OLD | NEW | 
|---|
| 1 { | 1 { | 
| 2   'conditions': [[ | 2   'conditions': [[ | 
| 3     # We don't want to use curl on Windows and Android, skip the check there | 3     # We don't want to use curl on Windows and Android, skip the check there | 
| 4     'OS=="win" or OS=="android"', | 4     'OS=="win" or OS=="android"', | 
| 5     { | 5     { | 
| 6       'variables': { | 6       'variables': { | 
| 7         'have_curl': 0 | 7         'have_curl': 0 | 
| 8       } | 8       } | 
| 9     }, | 9     }, | 
| 10     { | 10     { | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 26       'action': ['python', 'ensure_dependencies.py'], | 26       'action': ['python', 'ensure_dependencies.py'], | 
| 27     }], | 27     }], | 
| 28   }, | 28   }, | 
| 29   { | 29   { | 
| 30     'target_name': 'libadblockplus', | 30     'target_name': 'libadblockplus', | 
| 31     'type': '<(library)', | 31     'type': '<(library)', | 
| 32     'dependencies': ['ensure_dependencies'], | 32     'dependencies': ['ensure_dependencies'], | 
| 33     'include_dirs': [ | 33     'include_dirs': [ | 
| 34       'include', | 34       'include', | 
| 35       'third_party/v8/include', | 35       'third_party/v8/include', | 
|  | 36       'third_party/v8', | 
| 36     ], | 37     ], | 
| 37     'sources': [ | 38     'sources': [ | 
| 38       'src/AppInfoJsObject.cpp', | 39       'src/AppInfoJsObject.cpp', | 
| 39       'src/ConsoleJsObject.cpp', | 40       'src/ConsoleJsObject.cpp', | 
| 40       'src/DefaultLogSystem.cpp', | 41       'src/DefaultLogSystem.cpp', | 
| 41       'src/DefaultFileSystem.cpp', | 42       'src/DefaultFileSystem.cpp', | 
| 42       'src/FileSystemJsObject.cpp', | 43       'src/FileSystemJsObject.cpp', | 
| 43       'src/FilterEngine.cpp', | 44       'src/FilterEngine.cpp', | 
| 44       'src/GlobalJsObject.cpp', | 45       'src/GlobalJsObject.cpp', | 
| 45       'src/JsContext.cpp', | 46       'src/JsContext.cpp', | 
| (...skipping 13 matching lines...) Expand all  Loading... | 
| 59     'conditions': [ | 60     'conditions': [ | 
| 60       ['OS=="android"', { | 61       ['OS=="android"', { | 
| 61         'link_settings': { | 62         'link_settings': { | 
| 62           'libraries': [ | 63           'libraries': [ | 
| 63             'android_<(ANDROID_ARCH).release/obj.target/tools/gyp/libv8_base.<(A
     NDROID_ARCH).a', | 64             'android_<(ANDROID_ARCH).release/obj.target/tools/gyp/libv8_base.<(A
     NDROID_ARCH).a', | 
| 64             'android_<(ANDROID_ARCH).release/obj.target/tools/gyp/libv8_snapshot
     .a', | 65             'android_<(ANDROID_ARCH).release/obj.target/tools/gyp/libv8_snapshot
     .a', | 
| 65           ], | 66           ], | 
| 66         }, | 67         }, | 
| 67         'standalone_static_library': 1, # disable thin archives | 68         'standalone_static_library': 1, # disable thin archives | 
| 68       }, { | 69       }, { | 
| 69         'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 70         'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8', 'third_party/v8/t
     ools/gyp/v8.gyp:v8_libplatform',], | 
| 70         'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 71         'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8', 'thi
     rd_party/v8/tools/gyp/v8.gyp:v8_libplatform'], | 
| 71       }], | 72       }], | 
| 72       ['have_curl==1', | 73       ['have_curl==1', | 
| 73         { | 74         { | 
| 74           'sources': [ | 75           'sources': [ | 
| 75             'src/DefaultWebRequestCurl.cpp', | 76             'src/DefaultWebRequestCurl.cpp', | 
| 76           ], | 77           ], | 
| 77           'link_settings': { | 78           'link_settings': { | 
| 78             'libraries': ['-lcurl'] | 79             'libraries': ['-lcurl'] | 
| 79           }, | 80           }, | 
| 80           'all_dependent_settings': { | 81           'all_dependent_settings': { | 
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 180       'test/WebRequest.cpp' | 181       'test/WebRequest.cpp' | 
| 181     ], | 182     ], | 
| 182     'msvs_settings': { | 183     'msvs_settings': { | 
| 183       'VCLinkerTool': { | 184       'VCLinkerTool': { | 
| 184         'SubSystem': '1',   # Console | 185         'SubSystem': '1',   # Console | 
| 185         'EntryPointSymbol': 'mainCRTStartup', | 186         'EntryPointSymbol': 'mainCRTStartup', | 
| 186       }, | 187       }, | 
| 187     }, | 188     }, | 
| 188   }] | 189   }] | 
| 189 } | 190 } | 
| OLD | NEW | 
|---|