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

Side by Side Diff: libadblockplus.gyp

Issue 5708936187478016: Issue 1906 - Fix broken Android build (Closed)
Patch Set: Fixed some formatting issues, shared_ptr.reset() Created Jan. 29, 2015, 5:07 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Makefile ('k') | test/Notification.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 'src/WebRequestJsObject.cpp', 42 'src/WebRequestJsObject.cpp',
43 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' 43 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
44 ], 44 ],
45 'direct_dependent_settings': { 45 'direct_dependent_settings': {
46 'include_dirs': ['include'] 46 'include_dirs': ['include']
47 }, 47 },
48 'conditions': [ 48 'conditions': [
49 ['OS=="android"', { 49 ['OS=="android"', {
50 'link_settings': { 50 'link_settings': {
51 'libraries': [ 51 'libraries': [
52 'android_arm.release/obj.target/tools/gyp/libv8_base.a', 52 'android_arm.release/obj.target/tools/gyp/libv8_base.arm.a',
53 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a', 53 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a',
54 ], 54 ],
55 }, 55 },
56 'standalone_static_library': 1, # disable thin archives 56 'standalone_static_library': 1, # disable thin archives
57 }, { 57 }, {
58 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], 58 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'],
59 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], 59 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
60 }], 60 }],
61 ['have_curl==1', 61 ['have_curl==1',
62 { 62 {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 'VCLinkerTool': { 169 'VCLinkerTool': {
170 'SubSystem': '1', # Console 170 'SubSystem': '1', # Console
171 'EntryPointSymbol': 'mainCRTStartup', 171 'EntryPointSymbol': 'mainCRTStartup',
172 }, 172 },
173 }, 173 },
174 'xcode_settings': { 174 'xcode_settings': {
175 'OTHER_LDFLAGS': ['-stdlib=libstdc++'], 175 'OTHER_LDFLAGS': ['-stdlib=libstdc++'],
176 }, 176 },
177 }] 177 }]
178 } 178 }
OLDNEW
« no previous file with comments | « Makefile ('k') | test/Notification.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld