diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
| commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
| tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/crypto/BUILD.gn | |
| parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
| download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz | |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/crypto/BUILD.gn')
| -rw-r--r-- | chromium/crypto/BUILD.gn | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/chromium/crypto/BUILD.gn b/chromium/crypto/BUILD.gn index 8d24e609e14..ac48f7a3fcb 100644 --- a/chromium/crypto/BUILD.gn +++ b/chromium/crypto/BUILD.gn @@ -13,6 +13,7 @@ component("crypto") { "apple_keychain.h", "apple_keychain_ios.mm", "apple_keychain_mac.mm", + "auto_cbb.h", "capi_util.cc", "capi_util.h", "crypto_export.h", @@ -34,8 +35,6 @@ component("crypto") { "encryptor.h", "encryptor_nss.cc", "encryptor_openssl.cc", - "ghash.cc", - "ghash.h", "hkdf.cc", "hkdf.h", "hmac.cc", @@ -66,7 +65,6 @@ component("crypto") { "p224_spake.h", "random.cc", "random.h", - "rsa_private_key.cc", "rsa_private_key.h", "rsa_private_key_nss.cc", "rsa_private_key_openssl.cc", @@ -113,6 +111,8 @@ component("crypto") { "mock_apple_keychain.cc", "mock_apple_keychain.h", ] + } else { + libs = [ "Security.framework" ] } if (!is_mac) { @@ -130,10 +130,6 @@ component("crypto") { ] } - if (is_android) { - deps += [ "//third_party/android_tools:cpu_features" ] - } - if (use_openssl) { # Remove NSS files when using OpenSSL sources -= [ @@ -160,6 +156,7 @@ component("crypto") { sources -= [ "aead_openssl.cc", "aead_openssl.h", + "auto_cbb.h", "curve25519_openssl.cc", "ec_private_key_openssl.cc", "ec_signature_creator_openssl.cc", @@ -228,15 +225,6 @@ if (false && is_win) { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("crypto_unittests_run") { - testonly = true - deps = [ - ":crypto_unittests", - ] -} - test("crypto_unittests") { sources = [ "aead_openssl_unittest.cc", @@ -244,7 +232,6 @@ test("crypto_unittests") { "ec_private_key_unittest.cc", "ec_signature_creator_unittest.cc", "encryptor_unittest.cc", - "ghash_unittest.cc", "hkdf_unittest.cc", "hmac_unittest.cc", "nss_key_util_unittest.cc", |