Roll src/third_party/boringssl/src afe57cb14..6c22f542f

third_party/boringssl/boringssl.gyp

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     'boringssl.gypi',
   ],
   'targets': [
     {
       'target_name': 'boringssl',
       'type': '<(component)',
       'sources': [
         '<@(boringssl_crypto_sources)',
         '<@(boringssl_ssl_sources)',
       ],
       'defines': [
         'BORINGSSL_IMPLEMENTATION',
         'BORINGSSL_NO_STATIC_INITIALIZER',
+        'OPENSSL_SMALL',
       ],
       'dependencies': [ 'boringssl_asm' ],
       # TODO(davidben): Fix size_t truncations in BoringSSL.
       # https://crbug.com/429039
       'msvs_disabled_warnings': [ 4267, ],
       'conditions': [
         ['component == "shared_library"', {
           'defines': [
             'BORINGSSL_SHARED_LIBRARY',
           ],
         }],
       ],
       'include_dirs': [
         'src/include',
       ],
       'direct_dependent_settings': {
-        'defines': [
-          'OPENSSL_SMALL',
-        ],
         'include_dirs': [
           'src/include',
         ],
         'conditions': [
           ['component == "shared_library"', {
             'defines': [
               'BORINGSSL_SHARED_LIBRARY',
             ],
           }],
         ],
@@ skipping 96 matching lines @@
         }],
         ['msan == 1 or (target_arch != "arm" and target_arch != "ia32" and target_arch != "x64" and target_arch != "arm64")', {
           'direct_dependent_settings': {
             'defines': [ 'OPENSSL_NO_ASM' ],
           },
         }],
       ],
     },
   ],
 }