Revert r43217, r43215, r43208, r43207, and r43202.

runtime/bin/bin.gypi

 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 {
   'variables': {
     'gen_source_dir': '<(SHARED_INTERMEDIATE_DIR)',
 
     'io_cc_file': '<(gen_source_dir)/io_gen.cc',
     'io_patch_cc_file': '<(gen_source_dir)/io_patch_gen.cc',
@@ skipping 158 matching lines @@
         }],
         ['OS=="android"', {
           'link_settings': {
             'libraries': [
               '-ldl',
             ],
           },
         }],
       ],
     },
-    # 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',
       'toolsets': ['host', 'target'],
       'include_dirs': [
         '..',
       ],
       'includes': [
         'io_impl_sources.gypi',
       ],
       'sources': [
         'io_natives.h',
         'io_natives.cc',
       ],
       'conditions': [
-        ['dart_io_support==1 and dart_io_secure_socket==1', {
+        ['dart_io_support==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' ],
           },
           # 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': {
@@ skipping 65 matching lines @@
         'libdart_withcore',
         'libdart_builtin',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         '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': {
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
         }],
       ],
     },
     {
       # Generate snapshot bin file.
@@ skipping 135 matching lines @@
         'libdart_io',
         'build_observatory#host',
         'generate_snapshot_file#host',
         'generate_resources_cc_file#host',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'main.cc',
-        'builtin_common.cc',
         'builtin_natives.cc',
         'builtin_nolib.cc',
         'builtin.h',
         'io_natives.h',
         'vmservice.h',
         'vmservice_impl.cc',
         'vmservice_impl.h',
         '<(snapshot_cc_file)',
         '<(resources_cc_file)',
       ],
@@ skipping 31 matching lines @@
         'libdart_withcore',
         'libdart_builtin',
         'libdart_io',
         'generate_bootstrap_resources_cc_file#host',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'main.cc',
-        'builtin_common.cc',
+        'builtin.cc',
         'builtin_natives.cc',
-        'builtin.cc',
         'builtin.h',
         'io_natives.h',
         'vmservice.h',
         'vmservice_impl.cc',
         'vmservice_impl.h',
         # Include generated source files.
         '<(builtin_cc_file)',
         '<(io_cc_file)',
         '<(io_patch_cc_file)',
         '<(bootstrap_resources_cc_file)',
@@ skipping 31 matching lines @@
         'libdart_withcore',
         'libdart_builtin',
         'libdart_io',
         'generate_resources_cc_file#host',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'main.cc',
-        'builtin_common.cc',
+        'builtin.cc',
         'builtin_natives.cc',
-        'builtin.cc',
         'builtin.h',
         'io_natives.h',
         'vmservice.h',
         'vmservice_impl.cc',
         'vmservice_impl.h',
         # Include generated source files.
         '<(builtin_cc_file)',
         '<(io_cc_file)',
         '<(io_patch_cc_file)',
         '<(resources_cc_file)',
@@ skipping 39 matching lines @@
         'libdart_io',
         'generate_snapshot_file#host',
         'generate_snapshot_test_dat_file#host',
       ],
       'include_dirs': [
         '..',
         '<(gen_source_dir)',
       ],
       'sources': [
         'run_vm_tests.cc',
-        'builtin_common.cc',
         'builtin_natives.cc',
         'builtin_nolib.cc',
         'builtin.h',
         'io_natives.h',
         # Include generated source files.
         '<(snapshot_cc_file)',
         '<(builtin_cc_file)',
         '<(io_cc_file)',
         '<(io_patch_cc_file)',
       ],
@@ skipping 62 matching lines @@
         }],
         ['OS=="linux"', {
           'cflags': [
             '-fPIC',
           ],
         }],
       ],
     },
   ],
 }