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

Unified Diff: runtime/bin/bin.gypi

Issue 889443002: Service isolate rework take 2 (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 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 | « no previous file | runtime/bin/builtin.h » ('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 9ddd1a867c7fa8e4c2b18efff0a120557c3b04a3..afb5921649a4264a93bfd7c7ea497706a74a4e0f 100644
--- a/runtime/bin/bin.gypi
+++ b/runtime/bin/bin.gypi
@@ -176,6 +176,105 @@
}],
],
},
+ # This is a combination of libdart_io, libdart_builtin, and vmservice bits.
+ # The dart_io is built without support for secure sockets.
+ {
+ 'target_name': 'libvmservice_io',
+ 'type': 'static_library',
+ 'toolsets': ['host', 'target'],
+ 'include_dirs': [
+ '..',
+ '../include',
+ ],
+ 'includes': [
+ 'io_impl_sources.gypi',
+ 'builtin_impl_sources.gypi',
+ ],
+ 'dependencies': [
+ 'generate_builtin_cc_file#host',
+ 'generate_io_cc_file#host',
+ 'generate_io_patch_cc_file#host',
+ 'generate_snapshot_file#host',
+ 'generate_resources_cc_file#host',
+ ],
+ 'sources': [
+ 'builtin_common.cc',
+ 'builtin_natives.cc',
+ 'builtin_nolib.cc',
+ 'builtin.h',
+ 'dartutils.cc',
+ 'dartutils.h',
+ 'io_natives.cc',
+ 'io_natives.h',
+ 'log_android.cc',
+ 'log_linux.cc',
+ 'log_macos.cc',
+ 'log_win.cc',
+ 'vmservice_dartium.h',
+ 'vmservice_dartium.cc',
+ 'vmservice_impl.cc',
+ 'vmservice_impl.h',
+ '<(resources_cc_file)',
+ '<(snapshot_cc_file)',
+ ],
+ 'sources/': [
+ ['exclude', '_test\\.(cc|h)$'],
+ ],
+ 'conditions': [
+ ['dart_io_support==1 and dart_io_secure_socket==1', {
+ 'dependencies': [
+ 'bin/net/ssl.gyp:libssl_dart',
+ ],
+ }],
+ ['dart_io_secure_socket==0', {
+ 'defines': [
+ 'DART_IO_SECURE_SOCKET_DISABLED'
+ ],
+ }],
+ ['OS=="win"', {
+ 'sources/' : [
+ ['exclude', 'fdutils.h'],
+ ],
+ # TODO(antonm): fix the implementation.
+ # Current implementation accepts char* strings
+ # and therefore fails to compile once _UNICODE is
+ # enabled. That should be addressed using -A
+ # versions of functions and adding necessary conversions.
+ 'configurations': {
+ 'Common_Base': {
+ 'msvs_configuration_attributes': {
+ 'CharacterSet': '0',
+ },
+ },
+ },
+ 'link_settings': {
+ 'libraries': [ '-liphlpapi.lib' ],
+ },
+ }],
+ ['OS=="mac"', {
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
+ '$(SDKROOT)/System/Library/Frameworks/CoreServices.framework',
+ ],
+ },
+ }],
+ ['OS=="linux"', {
+ 'link_settings': {
+ 'libraries': [
+ '-ldl',
+ ],
+ },
+ }],
+ ['OS=="android"', {
+ 'link_settings': {
+ 'libraries': [
+ '-ldl',
+ ],
+ },
+ }],
+ ],
+ },
{
'target_name': 'libdart_io',
'type': 'static_library',
@@ -191,11 +290,21 @@
'io_natives.cc',
],
'conditions': [
- ['dart_io_support==1', {
+ ['dart_io_support==1 and dart_io_secure_socket==1', {
'dependencies': [
'bin/net/ssl.gyp:libssl_dart',
],
}],
+ ['dart_io_support==1 and dart_io_secure_socket==0', {
+ 'dependencies': [
+ 'bin/net/zlib.gyp:zlib_dart',
+ ],
+ }],
+ ['dart_io_secure_socket==0', {
+ 'defines': [
+ 'DART_IO_SECURE_SOCKET_DISABLED'
+ ],
+ }],
['OS=="win"', {
'link_settings': {
'libraries': [ '-liphlpapi.lib' ],
@@ -281,13 +390,22 @@
'gen_snapshot.cc',
# Very limited native resolver provided.
'builtin_gen_snapshot.cc',
+ 'builtin_common.cc',
'builtin.cc',
'builtin.h',
+ 'platform_android.cc',
+ 'platform_linux.cc',
+ 'platform_macos.cc',
+ 'platform_win.cc',
+ 'platform.h',
# Include generated source files.
'<(builtin_cc_file)',
'<(io_cc_file)',
'<(io_patch_cc_file)',
],
+ 'defines': [
+ 'PLATFORM_DISABLE_SOCKET'
+ ],
'conditions': [
['OS=="win"', {
'link_settings': {
@@ -443,6 +561,7 @@
],
'sources': [
'main.cc',
+ 'builtin_common.cc',
'builtin_natives.cc',
'builtin_nolib.cc',
'builtin.h',
@@ -494,8 +613,9 @@
],
'sources': [
'main.cc',
- 'builtin.cc',
+ 'builtin_common.cc',
'builtin_natives.cc',
+ 'builtin.cc',
'builtin.h',
'io_natives.h',
'vmservice.h',
@@ -547,8 +667,9 @@
],
'sources': [
'main.cc',
- 'builtin.cc',
+ 'builtin_common.cc',
'builtin_natives.cc',
+ 'builtin.cc',
'builtin.h',
'io_natives.h',
'vmservice.h',
@@ -608,6 +729,7 @@
],
'sources': [
'run_vm_tests.cc',
+ 'builtin_common.cc',
'builtin_natives.cc',
'builtin_nolib.cc',
'builtin.h',
« no previous file with comments | « no previous file | runtime/bin/builtin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698