BoringSSL: switch around GYP files again.

third_party/boringssl/boringssl.gyp

Index: third_party/boringssl/boringssl.gyp
diff --git a/third_party/boringssl/boringssl.gyp b/third_party/boringssl/boringssl.gyp
index 753e3a327f79a0b0dfee88e57121f38b1757acde..2fd16535ae04292ceadab9f9740ba7c8f394d439 100644
--- a/third_party/boringssl/boringssl.gyp
+++ b/third_party/boringssl/boringssl.gyp
@@ -3,24 +3,78 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    'boringssl_tests.gypi',
-    'boringssl_lib.gypi',
-  ],
   'targets': [
     {
-      'target_name': 'boringssl_unittests',
-      'type': 'executable',
+      'target_name': 'boringssl',
+      'type': '<(component)',
+      'includes': [
+        'boringssl.gypi',
+      ],
       'sources': [
-        'boringssl_unittest.cc',
-       ],
-      'dependencies': [
-        '<@(boringssl_test_targets)',
-        '../../base/base.gyp:base',
-        '../../base/base.gyp:run_all_unittests',
-        '../../base/base.gyp:test_support_base',
-        '../../testing/gtest.gyp:gtest',
+        '<@(boringssl_lib_sources)',
+      ],
+      'defines': [ 'BORINGSSL_IMPLEMENTATION' ],
+      'conditions': [
+        ['component == "shared_library"', {
+          'defines': [
+            'BORINGSSL_SHARED_LIBRARY',
+          ],
+        }],
+        ['target_arch == "arm"', {
+          'sources': [ '<@(boringssl_linux_arm_sources)' ],
+        }],
+        ['target_arch == "ia32"', {
+          'conditions': [
+            ['OS == "mac"', {
+              'sources': [ '<@(boringssl_mac_x86_sources)' ],
+            }],
+            ['OS == "linux" or OS == "android"', {
+              'sources': [ '<@(boringssl_linux_x86_sources)' ],
+            }],
+            ['OS != "mac" and OS != "linux" 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)' ],
+            }],
+            ['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' ],
+        }],
+      ],
+      'include_dirs': [
+        'src/include',
+        # This is for arm_arch.h, which is needed by some asm files. Since the
+        # asm files are generated and kept in a different directory, they
+        # cannot use relative paths to find this file.
+        'src/crypto',
       ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'src/include',
+        ],
+        'conditions': [
+          ['component == "shared_library"', {
+            'defines': [
+              'BORINGSSL_SHARED_LIBRARY',
+            ],
+          }],
+        ],
+      },
     },
   ],
 }