Source release 17.1.0

third_party/boringssl/boringssl.gyp

@@ -4,27 +4,11 @@
     'asm_target_arch%': 'none',
     'has_nasm%': 'false',
     'nasm_path%': 'nasm.exe',
-
-    'dependent_included_warning_flags': [
-      '-Wno-unknown-warning-option',
-      '-Wno-cast-qual',
-      '-Wno-ignored-qualifiers',
-      '-Wuseless-cast',
-    ],
-    'dependent_excluded_warning_flags': [
-      '-Wcast-qual',
-      '-Werror=cast-qual',
-      '-Wignored-qualifiers',
-      '-Werror=ignored-qualifiers',
-      '-Wuseless-cast',
-      '-Werror=useless-cast',
-    ],
   },
 
   'target_defaults': {
     'includes': ['../disable_warnings.gypi'],
     'cflags': [
-      '-fPIC',
       '-fvisibility=hidden',
     ],
 
@@ -35,38 +19,34 @@
       },
     },
 
-    'ldflags': [
-      '-fPIC',
-    ],
-
     'link_settings': {
       'conditions': [
-        ['OS!="win"', {
-          'libraries': [
-            '-lpthread',
-          ],
-        }, {
+        ['OS=="win"', {
           'libraries': [
             '-ladvapi32',
           ],
         }],
+        ['OS=="mac" or OS=="ios"', {
+          'ldflags': [
+            '-lpthread',
+          ],
+        }],
+        ['OS not in {"win","mac","ios"}', {
+          'libraries': [
+            '-lpthread',
+          ],
+        }],
       ],
     },
 
-    'direct_dependent_settings': {
-      # BoringSSL's exported headers fail these warnings
-      'cflags': ['<@(dependent_included_warning_flags)'],
-      'cflags!': ['<@(dependent_excluded_warning_flags)'],
-      'cflags_c!': ['<@(dependent_excluded_warning_flags)'],
-      'cflags_cc!': ['<@(dependent_excluded_warning_flags)'],
-    },
-
     'type': 'static_library',
     'standalone_static_library': 1,
+    'hard_dependency': 1,
   },
   'targets': [
     {
       'target_name': 'crypto',
+      'toolsets' : [ 'target' ],
 
       # Include the source file list generated by BoringSSL
       'includes': ['kit/boringssl.gypi'],
@@ -101,7 +81,7 @@
                     '<@(boringssl_linux_x86_files)',
                   ],
                 }],
-                ['asm_target_arch=="x86-64"', {
+                ['asm_target_arch in {"x86-64", "x64"}', {
                   'sources': [
                     '<@(boringssl_linux_x86_64_files)',
                   ],
@@ -138,7 +118,7 @@
                     ],
                   },
                 }],
-                ['asm_target_arch=="x86-64"', {
+                ['asm_target_arch in {"x86-64", "x64"}', {
                   'sources': [
                     '<@(boringssl_win_x86_64_files)',
                   ],
@@ -172,14 +152,14 @@
                 },
               ],
             }],
-            ['OS=="osx"', {
+            ['OS=="mac"', {
               'conditions': [
                 ['asm_target_arch=="x86"', {
                   'sources': [
                     '<@(boringssl_mac_x86_files)',
                   ],
                 }],
-                ['asm_target_arch=="x86-64"', {
+                ['asm_target_arch in {"x86-64", "x64"}', {
                   'sources': [
                     '<@(boringssl_mac_x86_64_files)',
                   ],
@@ -188,6 +168,11 @@
             }],
             ['OS=="ios"', {
               'conditions': [
+                ['asm_target_arch in {"x86-64", "x64"}', {
+                  'sources': [
+                    '<@(boringssl_mac_x86_64_files)',
+                  ],
+                }],
                 ['asm_target_arch=="arm"', {
                   'sources': [
                     '<@(boringssl_ios_arm_files)',
@@ -206,6 +191,7 @@
     },
     {
       'target_name': 'ssl',
+      'toolsets' : [ 'target' ],
 
       # Include the source file list generated by BoringSSL
       'includes': ['kit/boringssl.gypi'],