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

Delta Between Two Patch Sets: libadblockplus.gyp

Issue 6193234183192576: Issue 1197 - change local copy of v8 (to 4.3.15) to work with Visual Studio 2013 (Closed)
Left Patch Set: Created June 11, 2015, 1:19 p.m.
Right Patch Set: rebase and update Created May 17, 2016, 3:18 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « include/AdblockPlus/JsValue.h ('k') | src/ConsoleJsObject.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
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 'src/WebRequestJsObject.cpp', 54 'src/WebRequestJsObject.cpp',
55 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' 55 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
56 ], 56 ],
57 'direct_dependent_settings': { 57 'direct_dependent_settings': {
58 'include_dirs': ['include'] 58 'include_dirs': ['include']
59 }, 59 },
60 'conditions': [ 60 'conditions': [
61 ['OS=="android"', { 61 ['OS=="android"', {
62 'link_settings': { 62 'link_settings': {
63 'libraries': [ 63 'libraries': [
64 'android_arm.release/obj.target/tools/gyp/libv8_base.arm.a', 64 'android_<(ANDROID_ARCH).release/obj.target/tools/gyp/libv8_base.<(A NDROID_ARCH).a',
65 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a', 65 'android_<(ANDROID_ARCH).release/obj.target/tools/gyp/libv8_snapshot .a',
66 ], 66 ],
67 }, 67 },
68 'standalone_static_library': 1, # disable thin archives 68 'standalone_static_library': 1, # disable thin archives
69 }, { 69 }, {
70 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8', 'third_party/v8/t ools/gyp/v8.gyp:v8_libplatform',], 70 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8', 'third_party/v8/t ools/gyp/v8.gyp:v8_libplatform',],
71 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8', 'thi rd_party/v8/tools/gyp/v8.gyp:v8_libplatform'], 71 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8', 'thi rd_party/v8/tools/gyp/v8.gyp:v8_libplatform'],
72 }], 72 }],
73 ['have_curl==1', 73 ['have_curl==1',
74 { 74 {
75 'sources': [ 75 'sources': [
(...skipping 27 matching lines...) Expand all
103 ], 103 ],
104 'actions': [{ 104 'actions': [{
105 'action_name': 'convert_js', 105 'action_name': 'convert_js',
106 'variables': { 106 'variables': {
107 'library_files': [ 107 'library_files': [
108 'lib/info.js', 108 'lib/info.js',
109 'lib/io.js', 109 'lib/io.js',
110 'lib/prefs.js', 110 'lib/prefs.js',
111 'lib/utils.js', 111 'lib/utils.js',
112 'lib/elemHideHitRegistration.js', 112 'lib/elemHideHitRegistration.js',
113 'adblockplus/lib/filterNotifier.js', 113 'adblockpluscore/lib/events.js',
114 'adblockpluscore/lib/filterNotifier.js',
114 'lib/init.js', 115 'lib/init.js',
115 'adblockplus/lib/filterClasses.js', 116 'adblockpluscore/lib/filterClasses.js',
116 'adblockplus/lib/subscriptionClasses.js', 117 'adblockpluscore/lib/subscriptionClasses.js',
117 'adblockplus/lib/filterStorage.js', 118 'adblockpluscore/lib/filterStorage.js',
118 'adblockplus/lib/elemHide.js', 119 'adblockpluscore/lib/elemHide.js',
119 'adblockplus/lib/matcher.js', 120 'adblockpluscore/lib/cssRules.js',
120 'adblockplus/lib/filterListener.js', 121 'adblockpluscore/lib/matcher.js',
121 'adblockplus/lib/downloader.js', 122 'adblockpluscore/lib/filterListener.js',
122 'adblockplus/lib/notification.js', 123 'adblockpluscore/lib/downloader.js',
123 'adblockplus/lib/synchronizer.js', 124 'adblockpluscore/lib/notification.js',
125 'lib/notificationShowRegistration.js',
126 'adblockpluscore/lib/synchronizer.js',
124 'lib/filterUpdateRegistration.js', 127 'lib/filterUpdateRegistration.js',
125 'adblockplus/chrome/content/ui/subscriptions.xml', 128 'adblockpluscore/chrome/content/ui/subscriptions.xml',
126 'lib/updater.js', 129 'lib/updater.js',
127 ], 130 ],
128 'load_before_files': [ 131 'load_before_files': [
129 'lib/compat.js' 132 'lib/compat.js'
130 ], 133 ],
131 'load_after_files': [ 134 'load_after_files': [
132 'lib/api.js', 135 'lib/api.js',
133 'lib/publicSuffixList.js', 136 'lib/publicSuffixList.js',
134 'lib/punycode.js', 137 'lib/punycode.js',
135 'lib/basedomain.js', 138 'lib/basedomain.js',
(...skipping 19 matching lines...) Expand all
155 }] 158 }]
156 }, 159 },
157 { 160 {
158 'target_name': 'tests', 161 'target_name': 'tests',
159 'type': 'executable', 162 'type': 'executable',
160 'dependencies': [ 163 'dependencies': [
161 'third_party/googletest.gyp:googletest_main', 164 'third_party/googletest.gyp:googletest_main',
162 'libadblockplus' 165 'libadblockplus'
163 ], 166 ],
164 'sources': [ 167 'sources': [
168 'test/BaseJsTest.h',
169 'test/BaseJsTest.cpp',
165 'test/AppInfoJsObject.cpp', 170 'test/AppInfoJsObject.cpp',
166 'test/ConsoleJsObject.cpp', 171 'test/ConsoleJsObject.cpp',
167 'test/DefaultFileSystem.cpp', 172 'test/DefaultFileSystem.cpp',
168 'test/FileSystemJsObject.cpp', 173 'test/FileSystemJsObject.cpp',
169 'test/FilterEngine.cpp', 174 'test/FilterEngine.cpp',
170 'test/GlobalJsObject.cpp', 175 'test/GlobalJsObject.cpp',
171 'test/JsEngine.cpp', 176 'test/JsEngine.cpp',
172 'test/JsValue.cpp', 177 'test/JsValue.cpp',
173 'test/Notification.cpp', 178 'test/Notification.cpp',
174 'test/Prefs.cpp', 179 'test/Prefs.cpp',
175 'test/ReferrerMapping.cpp', 180 'test/ReferrerMapping.cpp',
176 'test/Thread.cpp', 181 'test/Thread.cpp',
177 'test/UpdateCheck.cpp', 182 'test/UpdateCheck.cpp',
178 'test/WebRequest.cpp' 183 'test/WebRequest.cpp'
179 ], 184 ],
180 'msvs_settings': { 185 'msvs_settings': {
181 'VCLinkerTool': { 186 'VCLinkerTool': {
182 'SubSystem': '1', # Console 187 'SubSystem': '1', # Console
183 'EntryPointSymbol': 'mainCRTStartup', 188 'EntryPointSymbol': 'mainCRTStartup',
184 }, 189 },
185 }, 190 },
186 'xcode_settings': {
187 'OTHER_LDFLAGS': ['-stdlib=libstdc++'],
188 },
189 }] 191 }]
190 } 192 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld