Index: runtime/bin/bin.gypi |
diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi |
index 8cc5866d47077277a36bbcbb68cb2711460e85f1..adfd7a92ac001d4d6d7657d76e4cdae5559a13b2 100644 |
--- a/runtime/bin/bin.gypi |
+++ b/runtime/bin/bin.gypi |
@@ -187,14 +187,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', |
+ ], |
}], |
['OS=="win"', { |
# TODO(antonm): fix the implementation. |
@@ -336,6 +341,7 @@ |
{ |
'target_name': 'generate_resources_cc_file', |
'type': 'none', |
+ 'toolsets':['host','target'], |
'includes': [ |
'vmstats_sources.gypi', |
], |
@@ -364,12 +370,13 @@ |
# dart binary with a snapshot of corelibs built in. |
'target_name': 'dart', |
'type': 'executable', |
+ 'toolsets':['target'], |
'dependencies': [ |
'libdart', |
'libdart_builtin', |
'libdart_io', |
'generate_snapshot_file#host', |
- 'generate_resources_cc_file', |
+ 'generate_resources_cc_file#host', |
], |
'include_dirs': [ |
'..', |
@@ -411,17 +418,41 @@ |
'-rdynamic', |
], |
}], |
+ ['OS=="android"', { |
+ 'link_settings': { |
+ 'ldflags': [ |
+ # The libraries we need should all be in |
+ # Lthird_party/skia/trunk/out/config/android-x86/Debug but |
+ # As I (gram) want to avoid patching the Skia gyp files to build |
+ # real libraries we'll just point to the location of the 'thin' |
+ # libraries used by the Skia build for now. |
+ # TODO(gram): We need to support debug vs release modes. |
gram
2013/05/28 17:04:19
I think this comment can just be removed - it refe
Bill Hesse
2013/05/29 09:12:44
Done.
|
+ # '<(skia_libs_location_android)', |
+ '-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'], |
'dependencies': [ |
'libdart_withcore', |
'libdart_builtin', |
'libdart_io', |
- 'generate_resources_cc_file', |
+ 'generate_resources_cc_file#host', |
], |
'include_dirs': [ |
'..', |
@@ -467,6 +498,30 @@ |
'-rdynamic', |
], |
}], |
+ |
+ ['OS=="android"', { |
+ 'link_settings': { |
+ 'ldflags': [ |
+ # The libraries we need should all be in |
+ # Lthird_party/skia/trunk/out/config/android-x86/Debug but |
+ # As I (gram) want to avoid patching the Skia gyp files to build |
+ # real libraries we'll just point to the location of the 'thin' |
+ # libraries used by the Skia build for now. |
gram
2013/05/28 17:04:19
Ditto
Bill Hesse
2013/05/29 09:12:44
Done.
|
+ # TODO(gram): We need to support debug vs release modes. |
+ # '<(skia_libs_location_android)', |
+ '-z', |
+ 'muldefs', |
+ ], |
+ 'ldflags!': [ |
+ '-Wl,--exclude-libs=ALL,-shared', |
+ ], |
+ 'libraries': [ |
+ '-llog', |
+ '-lc', |
+ '-lz', |
+ ], |
+ }, |
+ }], |
], |
}, |
{ |
@@ -479,6 +534,7 @@ |
{ |
'target_name': 'run_vm_tests', |
'type': 'executable', |
+ 'toolsets':['target'], |
zra
2013/05/28 16:56:16
To make running tests easier, we'll likely also be
Bill Hesse
2013/05/29 09:12:44
I wasn't sure if the entire 'link_settings' sectio
|
'dependencies': [ |
'libdart_withcore', |
'libdart_builtin', |
@@ -525,46 +581,78 @@ |
'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ], |
}, |
}], |
- ], |
- }, |
- { |
- '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=="android"', { |
+ |
+ 'link_settings': { |
+ 'ldflags': [ |
+ # The libraries we need should all be in |
+ # Lthird_party/skia/trunk/out/config/android-x86/Debug but |
+ # As I (gram) want to avoid patching the Skia gyp files to build |
+ # real libraries we'll just point to the location of the 'thin' |
+ # libraries used by the Skia build for now. |
+ # TODO(gram): We need to support debug vs release modes. |
gram
2013/05/28 17:04:19
Ditto
|
+ # '<(skia_libs_location_android)', |
+ '-z', |
+ 'muldefs', |
+ ], |
+ 'ldflags!': [ |
+ '-Wl,--exclude-libs=ALL,-shared', |
+ ], |
+ 'libraries': [ |
+ '-Wl,--start-group', |
+ '-Wl,--end-group', |
+ '-llog', |
+ '-lc', |
+ '-lz', |
+ ], |
}, |
}], |
- ['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', |
+ ], |
+ }], |
+ ], |
+ }, |
+ ], |
+ }], |
+ ], |
} |