Source release 15.0.0

third_party/boringssl/boringssl.gyp

@@ -2,6 +2,8 @@
 {
   'variables': {
     'asm_target_arch%': 'none',
+    'has_nasm%': 'false',
+    'nasm_path%': 'nasm.exe',
   },
 
   'target_defaults': {
@@ -16,9 +18,6 @@
     'cflags!': [
       '-Wbad-function-cast',
     ],
-    'cflags_c': [
-      '-std=gnu99',
-    ],
     'cflags_c!': [
       '-Wbad-function-cast',
     ],
@@ -26,6 +25,21 @@
     'ldflags': [
       '-fPIC',
     ],
+    'link_settings': {
+      'ldflags': [
+        '-lpthread',
+      ],
+    },
+
+    'link_settings': {
+      'conditions': [
+        ['OS=="win"', {
+          'libraries': [
+            '-ladvapi32',
+          ],
+        }],
+      ],
+    },
 
     'type': 'static_library',
     'standalone_static_library': 1,
@@ -54,7 +68,7 @@
         # of assembly language files for the current OS and CPU architecture, or
         # it will turn off assembly language files entirely if the
         # |asm_target_arch| has been set to "none".
-        ['asm_target_arch=="none"', {
+        ['asm_target_arch=="none" or (OS=="win" and has_nasm!="true")', {
           'defines': [
             'OPENSSL_NO_ASM',
           ],
@@ -91,17 +105,52 @@
             }],
             ['OS=="win"', {
               'conditions': [
+                # TODO: This doesn't allow building the Debug/Release
+                # configurations with x86-64, it requires using the
+                # Debug_x64/Release_x64 configurations.
                 ['asm_target_arch=="x86"', {
                   'sources': [
                     '<@(boringssl_win_x86_files)',
                   ],
+                  'variables': {
+                    'nasm_flags': [
+                      '-fwin32',
+                    ],
+                  },
                 }],
                 ['asm_target_arch=="x86-64"', {
                   'sources': [
                     '<@(boringssl_win_x86_64_files)',
                   ],
+                  'variables': {
+                    'nasm_flags': [
+                      '-fwin64',
+                    ],
+                  },
                 }],
               ],
+              'rules': [
+                {
+                  # We need a custom rule to generate asm files since it uses
+                  # NASM syntax and not MSVC syntax.
+                  'rule_name': 'nasm',
+                  'extension': 'asm',
+                  'message': 'NASM <(RULE_INPUT_PATH)',
+                  'msvs_external_rule': 1,
+                  'process_outputs_as_sources': 1,
+                  'msvs_cygwin_shell': 0,
+                  'outputs': [
+                    '<(INTERMEDIATE_DIR)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)_asm.obj'
+                  ],
+                  'action': [
+                    '<(nasm_path)',
+                    '-o',
+                    '<@(_outputs)',
+                    '<@(nasm_flags)',
+                    '<(RULE_INPUT_PATH)',
+                  ],
+                },
+              ],
             }],
             ['OS=="osx"', {
               'conditions': [
@@ -136,26 +185,32 @@
       ],
     },
     {
-      'target_name': 'legacy_ssl',
+      'target_name': 'ssl',
 
-      # Include the source file list generated by legacy BoringSSL
-      'includes': ['legacy_kit/boringssl.gypi'],
+      # Include the source file list generated by BoringSSL
+      'includes': ['kit/boringssl.gypi'],
+
+      'dependencies': [
+        'crypto',
+      ],
 
       'sources': [
-        '<@(boringssl_crypto_files)',
         '<@(boringssl_ssl_files)',
       ],
       'include_dirs': [
-        'legacy_kit/src/include',
+        'kit/src/include',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          'legacy_kit/src/include',
+          'kit/src/include',
         ],
       },
 
-      'defines': [
-        'OPENSSL_NO_ASM',
+      'cflags_cc': [
+        '-Wno-cast-align',
+      ],
+      'cflags_cc!': [
+        '-Wcast-align',
       ],
     },
   ],