Fix BoringSSL build and tests on OS X.

third_party/boringssl/boringssl_tests.gypi

Index: third_party/boringssl/boringssl_tests.gypi
diff --git a/third_party/boringssl/boringssl_tests.gypi b/third_party/boringssl/boringssl_tests.gypi
index 788c4c53608baf0f01381be999262bd7d2e91e55..aa74b8f5000b43ba2580d26aeaa324063f63da4d 100644
--- a/third_party/boringssl/boringssl_tests.gypi
+++ b/third_party/boringssl/boringssl_tests.gypi
@@ -7,179 +7,190 @@
 {
   'targets': [
     {
-      'target_name': 'boringssl_sha1_test',
+      'target_name': 'boringssl_base64_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/sha/sha1_test.c',
+        'src/crypto/base64/base64_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_gcm_test',
+      'target_name': 'boringssl_bio_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/modes/gcm_test.c',
+        'src/crypto/bio/bio_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_err_test',
+      'target_name': 'boringssl_bn_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/err/err_test.c',
+        'src/crypto/bn/bn_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_dsa_test',
+      'target_name': 'boringssl_bytestring_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/dsa/dsa_test.c',
+        'src/crypto/bytestring/bytestring_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_dh_test',
+      'target_name': 'boringssl_aead_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/dh/dh_test.c',
+        'src/crypto/cipher/aead_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_aead_test',
+      'target_name': 'boringssl_cipher_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/cipher/aead_test.c',
+        'src/crypto/cipher/cipher_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_cipher_test',
+      'target_name': 'boringssl_dh_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/cipher/cipher_test.c',
+        'src/crypto/dh/dh_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_hmac_test',
+      'target_name': 'boringssl_dsa_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/hmac/hmac_test.c',
+        'src/crypto/dsa/dsa_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_lhash_test',
+      'target_name': 'boringssl_example_mul',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/lhash/lhash_test.c',
+        'src/crypto/ec/example_mul.c',
       ],
     },
     {
-      'target_name': 'boringssl_bio_test',
+      'target_name': 'boringssl_ecdsa_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/bio/bio_test.c',
+        'src/crypto/ecdsa/ecdsa_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_md5_test',
+      'target_name': 'boringssl_err_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/md5/md5_test.c',
+        'src/crypto/err/err_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_rsa_test',
+      'target_name': 'boringssl_example_sign',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/rsa/rsa_test.c',
+        'src/crypto/evp/example_sign.c',
       ],
     },
     {
-      'target_name': 'boringssl_example_sign',
+      'target_name': 'boringssl_hmac_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/evp/example_sign.c',
+        'src/crypto/hmac/hmac_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_bn_test',
+      'target_name': 'boringssl_lhash_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/bn/bn_test.c',
+        'src/crypto/lhash/lhash_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_bytestring_test',
+      'target_name': 'boringssl_md5_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/bytestring/bytestring_test.c',
+        'src/crypto/md5/md5_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_example_mul',
+      'target_name': 'boringssl_gcm_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/ec/example_mul.c',
+        'src/crypto/modes/gcm_test.c',
       ],
     },
     {
-      'target_name': 'boringssl_ecdsa_test',
+      'target_name': 'boringssl_rsa_test',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
-        'src/crypto/ecdsa/ecdsa_test.c',
+        'src/crypto/rsa/rsa_test.c',
+      ],
+    },
+    {
+      'target_name': 'boringssl_sha1_test',
+      'type': 'executable',
+      'dependencies': [
+        'boringssl',
+      ],
+      'sources': [
+        'src/crypto/sha/sha1_test.c',
       ],
     },
   ],
   'variables': {
     'boringssl_test_targets': [
       'boringssl_aead_test',
+      'boringssl_base64_test',
       'boringssl_bio_test',
       'boringssl_bn_test',
       'boringssl_bytestring_test',