| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 'src/WebRequestJsObject.cpp', | 53 'src/WebRequestJsObject.cpp', |
| 54 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' | 54 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' |
| 55 ], | 55 ], |
| 56 'direct_dependent_settings': { | 56 'direct_dependent_settings': { |
| 57 'include_dirs': ['include'] | 57 'include_dirs': ['include'] |
| 58 }, | 58 }, |
| 59 'conditions': [ | 59 'conditions': [ |
| 60 ['OS=="android"', { | 60 ['OS=="android"', { |
| 61 'link_settings': { | 61 'link_settings': { |
| 62 'libraries': [ | 62 'libraries': [ |
| 63 'android_arm.release/obj.target/tools/gyp/libv8_base.arm.a', | 63 'android_<(ANDROID_ARCH).release/obj.target/tools/gyp/libv8_base.<(A
NDROID_ARCH).a', |
| 64 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a', | 64 'android_<(ANDROID_ARCH).release/obj.target/tools/gyp/libv8_snapshot
.a', |
| 65 ], | 65 ], |
| 66 }, | 66 }, |
| 67 'standalone_static_library': 1, # disable thin archives | 67 'standalone_static_library': 1, # disable thin archives |
| 68 }, { | 68 }, { |
| 69 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 69 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
| 70 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 70 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
| 71 }], | 71 }], |
| 72 ['have_curl==1', | 72 ['have_curl==1', |
| 73 { | 73 { |
| 74 'sources': [ | 74 'sources': [ |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 'test/WebRequest.cpp' | 178 'test/WebRequest.cpp' |
| 179 ], | 179 ], |
| 180 'msvs_settings': { | 180 'msvs_settings': { |
| 181 'VCLinkerTool': { | 181 'VCLinkerTool': { |
| 182 'SubSystem': '1', # Console | 182 'SubSystem': '1', # Console |
| 183 'EntryPointSymbol': 'mainCRTStartup', | 183 'EntryPointSymbol': 'mainCRTStartup', |
| 184 }, | 184 }, |
| 185 }, | 185 }, |
| 186 }] | 186 }] |
| 187 } | 187 } |
| OLD | NEW |