Index: content/content_child.gypi |
diff --git a/content/content_child.gypi b/content/content_child.gypi |
index 3e45b0c90998cd971bc3554bb5edcecab834f944..b0687974c4cadb8628ae593a4d332fd5b4496618 100644 |
--- a/content/content_child.gypi |
+++ b/content/content_child.gypi |
@@ -193,17 +193,51 @@ |
'child/web_url_loader_impl.h', |
'child/webblobregistry_impl.cc', |
'child/webblobregistry_impl.h', |
+ 'child/webcrypto/algorithm.cc', |
+ 'child/webcrypto/algorithm.h', |
+ 'child/webcrypto/algorithm_dispatch.cc', |
+ 'child/webcrypto/algorithm_dispatch.h', |
+ 'child/webcrypto/algorithm_registry.cc', |
+ 'child/webcrypto/algorithm_registry.h', |
'child/webcrypto/crypto_data.cc', |
'child/webcrypto/crypto_data.h', |
'child/webcrypto/jwk.cc', |
'child/webcrypto/jwk.h', |
+ 'child/webcrypto/nss/aes_cbc_nss.cc', |
+ 'child/webcrypto/nss/aes_gcm_nss.cc', |
+ 'child/webcrypto/nss/aes_key_nss.cc', |
+ 'child/webcrypto/nss/aes_key_nss.h', |
+ 'child/webcrypto/nss/aes_kw_nss.cc', |
+ 'child/webcrypto/nss/hmac_nss.cc', |
+ 'child/webcrypto/nss/key_nss.cc', |
+ 'child/webcrypto/nss/key_nss.h', |
+ 'child/webcrypto/nss/rsa_key_nss.cc', |
+ 'child/webcrypto/nss/rsa_key_nss.h', |
+ 'child/webcrypto/nss/rsa_oaep_nss.cc', |
+ 'child/webcrypto/nss/rsa_ssa_nss.cc', |
+ 'child/webcrypto/nss/sha_nss.cc', |
+ 'child/webcrypto/nss/sym_key_nss.cc', |
+ 'child/webcrypto/nss/sym_key_nss.h', |
+ 'child/webcrypto/nss/util_nss.cc', |
+ 'child/webcrypto/nss/util_nss.h', |
+ 'child/webcrypto/openssl/aes_cbc_openssl.cc', |
+ 'child/webcrypto/openssl/aes_gcm_openssl.cc', |
+ 'child/webcrypto/openssl/aes_key_openssl.cc', |
+ 'child/webcrypto/openssl/aes_key_openssl.h', |
+ 'child/webcrypto/openssl/aes_kw_openssl.cc', |
+ 'child/webcrypto/openssl/hmac_openssl.cc', |
+ 'child/webcrypto/openssl/key_openssl.cc', |
+ 'child/webcrypto/openssl/key_openssl.h', |
+ 'child/webcrypto/openssl/sha_openssl.cc', |
+ 'child/webcrypto/openssl/sym_key_openssl.cc', |
+ 'child/webcrypto/openssl/sym_key_openssl.h', |
+ 'child/webcrypto/openssl/util_openssl.cc', |
+ 'child/webcrypto/openssl/util_openssl.h', |
'child/webcrypto/platform_crypto.h', |
- 'child/webcrypto/platform_crypto_nss.cc', |
- 'child/webcrypto/platform_crypto_openssl.cc', |
- 'child/webcrypto/shared_crypto.cc', |
- 'child/webcrypto/shared_crypto.h', |
'child/webcrypto/status.cc', |
'child/webcrypto/status.h', |
+ 'child/webcrypto/structured_clone.cc', |
+ 'child/webcrypto/structured_clone.h', |
'child/webcrypto/webcrypto_impl.cc', |
'child/webcrypto/webcrypto_impl.h', |
'child/webcrypto/webcrypto_util.cc', |
@@ -287,16 +321,12 @@ |
], |
}], |
['use_openssl==1', { |
- 'sources!': [ |
- 'child/webcrypto/platform_crypto_nss.cc', |
- ], |
+ 'sources/': [ ['exclude', '/webcrypto/nss/.*'] ], |
'dependencies': [ |
'../third_party/openssl/openssl.gyp:openssl', |
], |
}, { |
- 'sources!': [ |
- 'child/webcrypto/platform_crypto_openssl.cc', |
- ], |
+ 'sources/': [ ['exclude', '/webcrypto/openssl/.*'] ], |
'conditions': [ |
['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { |
'dependencies': [ |