| Left: | ||
| Right: |
| LEFT | RIGHT |
|---|---|
| 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 27 matching lines...) Expand all Loading... | |
| 38 'src/Utils.cpp', | 38 'src/Utils.cpp', |
| 39 'src/WebRequestJsObject.cpp', | 39 'src/WebRequestJsObject.cpp', |
| 40 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' | 40 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' |
| 41 ], | 41 ], |
| 42 'direct_dependent_settings': { | 42 'direct_dependent_settings': { |
| 43 'include_dirs': ['include'] | 43 'include_dirs': ['include'] |
| 44 }, | 44 }, |
| 45 'conditions': [ | 45 'conditions': [ |
| 46 ['OS=="android"', { | 46 ['OS=="android"', { |
| 47 'link_settings': { | 47 'link_settings': { |
| 48 'ldflags': [ | |
|
Andrey Novikov
2013/06/18 11:48:28
This is not the part of callback staff but is a us
Wladimir Palant
2013/06/18 15:02:15
It should be android_arm.release however.
| |
| 49 '-Landroid_arm.debug/obj.target/tools/gyp' | |
| 50 ], | |
| 51 'libraries': [ | 48 'libraries': [ |
| 52 '-lv8_base', | 49 'android_arm.release/obj.target/tools/gyp/libv8_base.a', |
|
Felix Dahlke
2013/06/19 10:28:38
I'm surprised this works, it's not really common t
| |
| 53 '-lv8_nosnapshot', | 50 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a', |
| 54 ], | 51 ], |
| 55 }, | 52 }, |
| 56 'standalone_static_library': 1, # disable thin archives | 53 'standalone_static_library': 1, # disable thin archives |
| 57 }, { | 54 }, { |
| 58 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 55 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
| 59 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 56 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
| 60 }], | 57 }], |
| 61 ['have_curl==1', | 58 ['have_curl==1', |
| 62 { | 59 { |
| 63 'sources': [ | 60 'sources': [ |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 162 'test/WebRequest.cpp' | 159 'test/WebRequest.cpp' |
| 163 ], | 160 ], |
| 164 'msvs_settings': { | 161 'msvs_settings': { |
| 165 'VCLinkerTool': { | 162 'VCLinkerTool': { |
| 166 'SubSystem': '1', # Console | 163 'SubSystem': '1', # Console |
| 167 'EntryPointSymbol': 'mainCRTStartup', | 164 'EntryPointSymbol': 'mainCRTStartup', |
| 168 }, | 165 }, |
| 169 }, | 166 }, |
| 170 }] | 167 }] |
| 171 } | 168 } |
| LEFT | RIGHT |