Roll BoringSSL.

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.
 
 {
   'targets': [
     {
       'target_name': 'boringssl',
       'type': '<(component)',
       'includes': [
@@ skipping 21 matching lines @@
         ['target_arch == "ia32"', {
           'conditions': [
             ['OS == "mac"', {
               'sources': [ '<@(boringssl_mac_x86_sources)' ],
             }],
             ['OS == "linux" or OS == "android"', {
               'sources': [ '<@(boringssl_linux_x86_sources)' ],
             }],
             ['OS == "win"', {
               'sources': [ '<@(boringssl_win_x86_sources)' ],
-              # Win32 is built with Yasm. The other ports use the platform
-              # assembler.
+              # Windows' assembly is built with Yasm. The other platforms use
+              # the platform assembler.
               'variables': {
                 'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/boringssl',
               },
               'includes': [
                 '../yasm/yasm_compile.gypi',
               ],
             }],
             ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"', {
               'defines': [ 'OPENSSL_NO_ASM' ],
             }],
           ]
         }],
         ['target_arch == "x64"', {
           'conditions': [
             ['OS == "mac"', {
               'sources': [ '<@(boringssl_mac_x86_64_sources)' ],
             }],
             ['OS == "linux" or OS == "android"', {
               'sources': [ '<@(boringssl_linux_x86_64_sources)' ],
             }],
             ['OS == "win"', {
               'sources': [ '<@(boringssl_win_x86_64_sources)' ],
+              # Windows' assembly is built with Yasm. The other platforms use
+              # the platform assembler.
+              'variables': {
+                'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/boringssl',
+              },
+              'includes': [
+                '../yasm/yasm_compile.gypi',
+              ],
             }],
             ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"', {
               'defines': [ 'OPENSSL_NO_ASM' ],
             }],
           ]
         }],
         ['target_arch != "arm" and target_arch != "ia32" and target_arch != "x64"', {
           'defines': [ 'OPENSSL_NO_ASM' ],
         }],
       ],
@@ skipping 12 matching lines @@
           ['component == "shared_library"', {
             'defines': [
               'BORINGSSL_SHARED_LIBRARY',
             ],
           }],
         ],
       },
     },
   ],
 }