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

Delta Between Two Patch Sets: libadblockplus.gyp

Issue 10488022: Added Android build target (Closed)
Left Patch Set: Created May 16, 2013, 10:23 a.m.
Right 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:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « common.gypi ('k') | test/DefaultFileSystem.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, skip the check there 3 # We don't want to use curl on Windows and Android, skip the check there
Felix Dahlke 2013/05/23 13:35:44 How about "... on Windows or Android ..."?
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/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 'sources': [ 25 'sources': [
26 'src/AppInfoJsObject.cpp', 26 'src/AppInfoJsObject.cpp',
27 'src/ConsoleJsObject.cpp', 27 'src/ConsoleJsObject.cpp',
28 'src/DefaultLogSystem.cpp', 28 'src/DefaultLogSystem.cpp',
29 'src/DefaultFileSystem.cpp', 29 'src/DefaultFileSystem.cpp',
30 'src/FileSystemJsObject.cpp', 30 'src/FileSystemJsObject.cpp',
31 'src/FilterEngine.cpp', 31 'src/FilterEngine.cpp',
32 'src/GlobalJsObject.cpp', 32 'src/GlobalJsObject.cpp',
33 'src/JsContext.cpp',
33 'src/JsEngine.cpp', 34 'src/JsEngine.cpp',
35 'src/JsError.cpp',
34 'src/JsValue.cpp', 36 'src/JsValue.cpp',
35 'src/Thread.cpp', 37 'src/Thread.cpp',
36 'src/Utils.cpp', 38 'src/Utils.cpp',
37 'src/WebRequestJsObject.cpp', 39 'src/WebRequestJsObject.cpp',
38 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' 40 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
39 ], 41 ],
40 'direct_dependent_settings': { 42 'direct_dependent_settings': {
41 'include_dirs': [ 43 'include_dirs': ['include']
42 'include',
43 'third_party/v8/include',
Wladimir Palant 2013/05/16 10:32:19 Not sure why this only came up when compiling for
44 ]
45 }, 44 },
46 'conditions': [ 45 'conditions': [
47 ['OS=="android"', { 46 ['OS=="android"', {
48 'link_settings': { 47 'link_settings': {
49 'libraries': [ 48 'libraries': [
50 'android_arm.release/obj.target/tools/gyp/libv8_base.a', 49 'android_arm.release/obj.target/tools/gyp/libv8_base.a',
51 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a', 50 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a',
52 ], 51 ],
53 } 52 }
54 }, { 53 }, {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 'actions': [{ 88 'actions': [{
90 'action_name': 'convert_js', 89 'action_name': 'convert_js',
91 'variables': { 90 'variables': {
92 'library_files': [ 91 'library_files': [
93 'lib/info.js', 92 'lib/info.js',
94 'lib/io.js', 93 'lib/io.js',
95 'lib/prefs.js', 94 'lib/prefs.js',
96 'lib/utils.js', 95 'lib/utils.js',
97 'lib/elemHideHitRegistration.js', 96 'lib/elemHideHitRegistration.js',
98 'adblockplus/lib/filterNotifier.js', 97 'adblockplus/lib/filterNotifier.js',
98 'lib/init.js',
99 'adblockplus/lib/filterClasses.js', 99 'adblockplus/lib/filterClasses.js',
100 'adblockplus/lib/subscriptionClasses.js', 100 'adblockplus/lib/subscriptionClasses.js',
101 'adblockplus/lib/filterStorage.js', 101 'adblockplus/lib/filterStorage.js',
102 'adblockplus/lib/elemHide.js', 102 'adblockplus/lib/elemHide.js',
103 'adblockplus/lib/matcher.js', 103 'adblockplus/lib/matcher.js',
104 'adblockplus/lib/filterListener.js', 104 'adblockplus/lib/filterListener.js',
105 'adblockplus/lib/synchronizer.js', 105 'adblockplus/lib/synchronizer.js',
106 'adblockplus/chrome/content/ui/subscriptions.xml', 106 'adblockplus/chrome/content/ui/subscriptions.xml',
107 ], 107 ],
108 'load_before_files': [ 108 'load_before_files': [
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 'test/WebRequest.cpp' 154 'test/WebRequest.cpp'
155 ], 155 ],
156 'msvs_settings': { 156 'msvs_settings': {
157 'VCLinkerTool': { 157 'VCLinkerTool': {
158 'SubSystem': '1', # Console 158 'SubSystem': '1', # Console
159 'EntryPointSymbol': 'mainCRTStartup', 159 'EntryPointSymbol': 'mainCRTStartup',
160 }, 160 },
161 }, 161 },
162 }] 162 }]
163 } 163 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld