Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: libadblockplus.gyp

Issue 5519479341580288: Issue 2437 - Update adblockplus dependency to revision 752ffe2eeaf1 (Closed)
Left Patch Set: Created April 29, 2015, 4:44 p.m.
Right Patch Set: Run ensure_dependencies.py during the build Created May 29, 2015, 7:12 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « lib/prefs.js ('k') | test/UpdateCheck.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
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 {
11 'variables': { 11 'variables': {
12 'have_curl': '<!(python check_curl.py)' 12 'have_curl': '<!(python check_curl.py)'
13 } 13 }
14 } 14 }
15 ]], 15 ]],
16 'includes': ['third_party/v8/build/features.gypi', 16 'includes': ['third_party/v8/build/features.gypi',
17 'third_party/v8/build/toolchain.gypi', 17 'third_party/v8/build/toolchain.gypi',
18 'shell/shell.gyp'], 18 'shell/shell.gyp'],
19 'targets': [{ 19 'targets': [{
20 'target_name': 'ensure_dependencies',
21 'type': 'none',
22 'actions': [{
23 'action_name': 'ensure_dependencies',
24 'inputs': ['ensure_dependencies.py'],
25 'outputs': ['ensure_dependencies_phony_output'],
Felix Dahlke 2015/05/29 07:15:59 This is kind of ugly, but the best way I could fin
26 'action': ['python', 'ensure_dependencies.py'],
27 }],
28 },
29 {
20 'target_name': 'libadblockplus', 30 'target_name': 'libadblockplus',
21 'type': '<(library)', 31 'type': '<(library)',
32 'dependencies': ['ensure_dependencies'],
22 'include_dirs': [ 33 'include_dirs': [
23 'include', 34 'include',
24 'third_party/v8/include', 35 'third_party/v8/include',
25 ], 36 ],
26 'sources': [ 37 'sources': [
27 'src/AppInfoJsObject.cpp', 38 'src/AppInfoJsObject.cpp',
28 'src/ConsoleJsObject.cpp', 39 'src/ConsoleJsObject.cpp',
29 'src/DefaultLogSystem.cpp', 40 'src/DefaultLogSystem.cpp',
30 'src/DefaultFileSystem.cpp', 41 'src/DefaultFileSystem.cpp',
31 'src/FileSystemJsObject.cpp', 42 'src/FileSystemJsObject.cpp',
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 'VCLinkerTool': { 180 'VCLinkerTool': {
170 'SubSystem': '1', # Console 181 'SubSystem': '1', # Console
171 'EntryPointSymbol': 'mainCRTStartup', 182 'EntryPointSymbol': 'mainCRTStartup',
172 }, 183 },
173 }, 184 },
174 'xcode_settings': { 185 'xcode_settings': {
175 'OTHER_LDFLAGS': ['-stdlib=libstdc++'], 186 'OTHER_LDFLAGS': ['-stdlib=libstdc++'],
176 }, 187 },
177 }] 188 }]
178 } 189 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld