Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Unified Diff: runtime/bin/bin.gypi

Issue 15706008: A working version of dart on Android. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comments, merge with zra's CL. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dart.gyp ('k') | runtime/tools/create_snapshot_bin.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/bin.gypi
diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi
index f2d5cc3c4528d2b659a30ce4a076bd0651b8ea3d..c6ba7545d8bd984cd7c10454d0f9e1634967ef1f 100644
--- a/runtime/bin/bin.gypi
+++ b/runtime/bin/bin.gypi
@@ -188,14 +188,19 @@
'io_natives.h',
'io_natives.cc',
],
- 'includes': [
- 'io_impl_sources.gypi',
- ],
'conditions': [
[ 'dart_io_support==1', {
'dependencies': [
'bin/net/ssl.gyp:libssl_dart',
],
+ 'includes': [
+ 'io_impl_sources.gypi',
+ ],
+ },
+ {
+ 'includes': [
+ 'io_impl_sources_no_nss.gypi',
Ivan Posva 2013/05/30 20:34:54 Where is 'io_impl_sources_no_nss.gypi'?
Bill Hesse 2013/05/31 15:40:43 This was accidentally omitted from the CL. It is
+ ],
}],
['OS=="win"', {
# TODO(antonm): fix the implementation.
@@ -337,6 +342,7 @@
{
'target_name': 'generate_resources_cc_file',
'type': 'none',
+ 'toolsets':['host','target'],
Søren Gjesse 2013/05/29 09:20:43 In most of the other places the order is reversed
Ivan Posva 2013/05/30 20:34:54 I would like to understand why the generate_resour
Bill Hesse 2013/05/31 15:40:43 Done.
'includes': [
'vmstats_sources.gypi',
],
@@ -365,12 +371,13 @@
# dart binary with a snapshot of corelibs built in.
'target_name': 'dart',
'type': 'executable',
+ 'toolsets':['target'],
Ivan Posva 2013/05/30 20:34:54 This seems rather unnecessary, 'target' is the def
'dependencies': [
'libdart',
'libdart_builtin',
'libdart_io',
'generate_snapshot_file#host',
- 'generate_resources_cc_file',
+ 'generate_resources_cc_file#host',
Ivan Posva 2013/05/30 20:34:54 I am surprised that the #host was necessary here.
Bill Hesse 2013/05/31 15:40:43 Done.
],
'include_dirs': [
'..',
@@ -412,17 +419,34 @@
'-rdynamic',
],
}],
+ ['OS=="android"', {
+ 'link_settings': {
+ 'ldflags': [
+ '-z',
+ 'muldefs',
+ ],
+ 'ldflags!': [
+ '-Wl,--exclude-libs=ALL,-shared',
+ ],
+ 'libraries': [
+ '-llog',
+ '-lc',
+ '-lz',
+ ],
+ },
+ }],
],
},
{
# dart binary without any snapshot built in.
'target_name': 'dart_no_snapshot',
'type': 'executable',
+ 'toolsets':['target'],
Ivan Posva 2013/05/30 20:34:54 ditto
'dependencies': [
'libdart_withcore',
'libdart_builtin',
'libdart_io',
- 'generate_resources_cc_file',
+ 'generate_resources_cc_file#host',
],
'include_dirs': [
'..',
@@ -468,6 +492,23 @@
'-rdynamic',
],
}],
+
+ ['OS=="android"', {
+ 'link_settings': {
+ 'ldflags': [
+ '-z',
+ 'muldefs',
+ ],
+ 'ldflags!': [
+ '-Wl,--exclude-libs=ALL,-shared',
+ ],
+ 'libraries': [
+ '-llog',
+ '-lc',
+ '-lz',
+ ],
+ },
+ }],
],
},
{
@@ -527,6 +568,25 @@
'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ],
},
}],
+ ['OS=="android"', {
+
+ 'link_settings': {
+ 'ldflags': [
+ '-z',
+ 'muldefs',
+ ],
+ 'ldflags!': [
+ '-Wl,--exclude-libs=ALL,-shared',
+ ],
+ 'libraries': [
+ '-Wl,--start-group',
+ '-Wl,--end-group',
+ '-llog',
+ '-lc',
+ '-lz',
+ ],
+ },
+ }],
],
},
{
@@ -581,44 +641,50 @@
}],
],
},
- {
- 'target_name': 'test_extension',
- 'type': 'shared_library',
- 'dependencies': [
- 'dart',
- ],
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'test_extension.cc',
- 'test_extension_dllmain_win.cc',
- ],
- 'defines': [
- # The only effect of DART_SHARED_LIB is to export the Dart API entries.
- 'DART_SHARED_LIB',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalDependencies': [ 'dart.lib' ],
- 'AdditionalLibraryDirectories': [ '<(PRODUCT_DIR)' ],
- },
- },
- }],
- ['OS=="mac"', {
- 'xcode_settings': {
- 'OTHER_LDFLAGS': [ '-undefined', 'dynamic_lookup' ],
- },
- }],
- ['OS=="linux"', {
- 'cflags': [
- '-fPIC',
+ ],
+ 'conditions': [
+ ['OS!="android"', {
+ 'targets': [
+ {
+ 'target_name': 'test_extension',
+ 'type': 'shared_library',
+ 'dependencies': [
+ 'dart',
],
- }],
+ 'include_dirs': [
+ '..',
+ ],
+ 'sources': [
+ 'test_extension.cc',
+ 'test_extension_dllmain_win.cc',
+ ],
+ 'defines': [
+ # The only effect of DART_SHARED_LIB is to export the Dart API.
+ 'DART_SHARED_LIB',
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalDependencies': [ 'dart.lib' ],
+ 'AdditionalLibraryDirectories': [ '<(PRODUCT_DIR)' ],
+ },
+ },
+ }],
+ ['OS=="mac"', {
+ 'xcode_settings': {
+ 'OTHER_LDFLAGS': [ '-undefined', 'dynamic_lookup' ],
+ },
+ }],
+ ['OS=="linux"', {
+ 'cflags': [
+ '-fPIC',
+ ],
+ }],
+ ],
+ },
],
- },
+ }],
],
}
« no previous file with comments | « dart.gyp ('k') | runtime/tools/create_snapshot_bin.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698