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

Unified Diff: libadblockplus.gyp

Issue 10488022: Added Android build target (Closed)
Patch Set: Review comments addressed Created May 24, 2013, 8:40 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « common.gypi ('k') | test/DefaultFileSystem.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libadblockplus.gyp
===================================================================
--- a/libadblockplus.gyp
+++ b/libadblockplus.gyp
@@ -1,12 +1,12 @@
{
'conditions': [[
- # We don't want to use curl on Windows, skip the check there
- 'OS=="win"',
+ # We don't want to use curl on Windows and Android, skip the check there
+ 'OS=="win" or OS=="android"',
{
'variables': {
'have_curl': 0
}
},
{
'variables': {
'have_curl': '<!(python check_curl.py)'
@@ -15,19 +15,18 @@
]],
'includes': ['third_party/v8/build/common.gypi',
'shell/shell.gyp'],
'targets': [{
'target_name': 'libadblockplus',
'type': '<(library)',
'include_dirs': [
'include',
- 'third_party/v8/include'
+ 'third_party/v8/include',
],
- 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'],
'sources': [
'src/AppInfoJsObject.cpp',
'src/ConsoleJsObject.cpp',
'src/DefaultLogSystem.cpp',
'src/DefaultFileSystem.cpp',
'src/FileSystemJsObject.cpp',
'src/FilterEngine.cpp',
'src/GlobalJsObject.cpp',
@@ -38,18 +37,28 @@
'src/Thread.cpp',
'src/Utils.cpp',
'src/WebRequestJsObject.cpp',
'<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
],
'direct_dependent_settings': {
'include_dirs': ['include']
},
- 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
'conditions': [
+ ['OS=="android"', {
+ 'link_settings': {
+ 'libraries': [
+ 'android_arm.release/obj.target/tools/gyp/libv8_base.a',
+ 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a',
+ ],
+ }
+ }, {
+ 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'],
+ 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
+ }],
['have_curl==1',
{
'sources': [
'src/DefaultWebRequestCurl.cpp',
],
'link_settings': {
'libraries': ['-lcurl']
},
« 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