Breaking Change: merge BoringSSL branch into master

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 204 matching lines @@
         'vmservice_dartium.h',
         'vmservice_dartium.cc',
         'vmservice_impl.cc',
         'vmservice_impl.h',
         '<(resources_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.
@@ skipping 45 matching lines @@
         '../../third_party',
       ],
       'includes': [
         'io_impl_sources.gypi',
       ],
       'sources': [
         'io_natives.h',
         'io_natives.cc',
       ],
       'conditions': [
-        ['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', {
+        ['dart_io_support==1', {
           'dependencies': [
             'bin/net/zlib.gyp:zlib_dart',
           ],
         }],
+        ['dart_io_support==1 and dart_io_secure_socket==1', {
+          'dependencies': [
+            '../third_party/boringssl/boringssl_dart.gyp:boringssl',
+          ],
+        }],
         ['dart_io_secure_socket==0', {
           'defines': [
             'DART_IO_SECURE_SOCKET_DISABLED'
           ],
         }],
         ['OS=="win"', {
           'link_settings': {
             'libraries': [ '-liphlpapi.lib' ],
           },
           # TODO(antonm): fix the implementation.
@@ skipping 11 matching lines @@
         }],
         ['OS=="mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreServices.framework',
             ],
           },
         }],
       ],
-      'configurations': {
-        'Dart_Android_Base': {
-          'target_conditions': [
-            ['_toolset=="target"', {
-              'defines': [
-                # Needed for sources outside of nss that include pr and ssl
-                # header files.
-                'MDCPUCFG="md/_linux.cfg"',
-              ],
-            }],
-          ],
-        },
-      },
     },
     {
       'target_name': 'libdart_nosnapshot',
       'type': 'static_library',
       'toolsets':['target','host'],
       'dependencies': [
         'libdart_lib_nosnapshot',
         'libdart_vm_nosnapshot',
         'libdouble_conversion',
         'generate_version_cc_file#host',
@@ skipping 459 matching lines @@
         }],
         ['OS=="linux"', {
           'cflags': [
             '-fPIC',
           ],
         }],
       ],
     },
   ],
 }