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

Side by Side Diff: libadblockplus.gyp

Issue 10488022: Added Android build target (Closed)
Patch Set: Review comments addressed Created May 24, 2013, 8:40 a.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 | « common.gypi ('k') | test/DefaultFileSystem.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, skip the check there 3 # We don't want to use curl on Windows and Android, skip the check there
4 'OS=="win"', 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/common.gypi', 16 'includes': ['third_party/v8/build/common.gypi',
17 'shell/shell.gyp'], 17 'shell/shell.gyp'],
18 'targets': [{ 18 'targets': [{
19 'target_name': 'libadblockplus', 19 'target_name': 'libadblockplus',
20 'type': '<(library)', 20 'type': '<(library)',
21 'include_dirs': [ 21 'include_dirs': [
22 'include', 22 'include',
23 'third_party/v8/include' 23 'third_party/v8/include',
24 ], 24 ],
25 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'],
26 'sources': [ 25 'sources': [
27 'src/AppInfoJsObject.cpp', 26 'src/AppInfoJsObject.cpp',
28 'src/ConsoleJsObject.cpp', 27 'src/ConsoleJsObject.cpp',
29 'src/DefaultLogSystem.cpp', 28 'src/DefaultLogSystem.cpp',
30 'src/DefaultFileSystem.cpp', 29 'src/DefaultFileSystem.cpp',
31 'src/FileSystemJsObject.cpp', 30 'src/FileSystemJsObject.cpp',
32 'src/FilterEngine.cpp', 31 'src/FilterEngine.cpp',
33 'src/GlobalJsObject.cpp', 32 'src/GlobalJsObject.cpp',
34 'src/JsContext.cpp', 33 'src/JsContext.cpp',
35 'src/JsEngine.cpp', 34 'src/JsEngine.cpp',
36 'src/JsError.cpp', 35 'src/JsError.cpp',
37 'src/JsValue.cpp', 36 'src/JsValue.cpp',
38 'src/Thread.cpp', 37 'src/Thread.cpp',
39 'src/Utils.cpp', 38 'src/Utils.cpp',
40 'src/WebRequestJsObject.cpp', 39 'src/WebRequestJsObject.cpp',
41 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' 40 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
42 ], 41 ],
43 'direct_dependent_settings': { 42 'direct_dependent_settings': {
44 'include_dirs': ['include'] 43 'include_dirs': ['include']
45 }, 44 },
46 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
47 'conditions': [ 45 'conditions': [
46 ['OS=="android"', {
47 'link_settings': {
48 'libraries': [
49 'android_arm.release/obj.target/tools/gyp/libv8_base.a',
50 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a',
51 ],
52 }
53 }, {
54 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'],
55 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
56 }],
48 ['have_curl==1', 57 ['have_curl==1',
49 { 58 {
50 'sources': [ 59 'sources': [
51 'src/DefaultWebRequestCurl.cpp', 60 'src/DefaultWebRequestCurl.cpp',
52 ], 61 ],
53 'link_settings': { 62 'link_settings': {
54 'libraries': ['-lcurl'] 63 'libraries': ['-lcurl']
55 }, 64 },
56 'all_dependent_settings': { 65 'all_dependent_settings': {
57 'defines': ['HAVE_CURL'], 66 'defines': ['HAVE_CURL'],
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 'test/WebRequest.cpp' 154 'test/WebRequest.cpp'
146 ], 155 ],
147 'msvs_settings': { 156 'msvs_settings': {
148 'VCLinkerTool': { 157 'VCLinkerTool': {
149 'SubSystem': '1', # Console 158 'SubSystem': '1', # Console
150 'EntryPointSymbol': 'mainCRTStartup', 159 'EntryPointSymbol': 'mainCRTStartup',
151 }, 160 },
152 }, 161 },
153 }] 162 }]
154 } 163 }
OLDNEW
« no previous file with comments | « common.gypi ('k') | test/DefaultFileSystem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld