| Index: content/content_child.gypi
|
| diff --git a/content/content_child.gypi b/content/content_child.gypi
|
| index d13a947ddc71d04c1632407e4d879ad0edef0f65..c31c42bfb6fe1c58db283e035666066673e3dfe8 100644
|
| --- a/content/content_child.gypi
|
| +++ b/content/content_child.gypi
|
| @@ -6,6 +6,7 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| '../components/tracing.gyp:tracing',
|
| + '../components/webcrypto/webcrypto.gyp:webcrypto',
|
| '../mojo/mojo_base.gyp:mojo_environment_chromium',
|
| '../mojo/mojo_base.gyp:mojo_common_lib',
|
| '../skia/skia.gyp:skia',
|
| @@ -268,25 +269,6 @@
|
| 'child/web_url_request_util.h',
|
| 'child/webblobregistry_impl.cc',
|
| 'child/webblobregistry_impl.h',
|
| - 'child/webcrypto/algorithm_dispatch.cc',
|
| - 'child/webcrypto/algorithm_dispatch.h',
|
| - 'child/webcrypto/algorithm_implementation.cc',
|
| - 'child/webcrypto/algorithm_implementation.h',
|
| - 'child/webcrypto/algorithm_registry.cc',
|
| - 'child/webcrypto/algorithm_registry.h',
|
| - 'child/webcrypto/crypto_data.cc',
|
| - 'child/webcrypto/crypto_data.h',
|
| - 'child/webcrypto/generate_key_result.cc',
|
| - 'child/webcrypto/generate_key_result.h',
|
| - 'child/webcrypto/jwk.cc',
|
| - 'child/webcrypto/jwk.h',
|
| - 'child/webcrypto/platform_crypto.h',
|
| - 'child/webcrypto/status.cc',
|
| - 'child/webcrypto/status.h',
|
| - 'child/webcrypto/webcrypto_impl.cc',
|
| - 'child/webcrypto/webcrypto_impl.h',
|
| - 'child/webcrypto/webcrypto_util.cc',
|
| - 'child/webcrypto/webcrypto_util.h',
|
| 'child/webfallbackthemeengine_impl.cc',
|
| 'child/webfallbackthemeengine_impl.h',
|
| 'child/webfileutilities_impl.cc',
|
| @@ -311,52 +293,6 @@
|
| 'child/worker_thread_message_filter.cc',
|
| 'child/worker_thread_message_filter.h',
|
| ],
|
| - 'webcrypto_nss_sources': [
|
| - 'child/webcrypto/nss/aes_algorithm_nss.cc',
|
| - 'child/webcrypto/nss/aes_algorithm_nss.h',
|
| - 'child/webcrypto/nss/aes_cbc_nss.cc',
|
| - 'child/webcrypto/nss/aes_gcm_nss.cc',
|
| - '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_hashed_algorithm_nss.cc',
|
| - 'child/webcrypto/nss/rsa_hashed_algorithm_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',
|
| - ],
|
| - 'webcrypto_openssl_sources': [
|
| - 'child/webcrypto/openssl/aes_algorithm_openssl.cc',
|
| - 'child/webcrypto/openssl/aes_algorithm_openssl.h',
|
| - 'child/webcrypto/openssl/aes_cbc_openssl.cc',
|
| - 'child/webcrypto/openssl/aes_ctr_openssl.cc',
|
| - 'child/webcrypto/openssl/aes_gcm_openssl.cc',
|
| - 'child/webcrypto/openssl/aes_kw_openssl.cc',
|
| - 'child/webcrypto/openssl/ec_algorithm_openssl.cc',
|
| - 'child/webcrypto/openssl/ec_algorithm_openssl.h',
|
| - 'child/webcrypto/openssl/ecdh_openssl.cc',
|
| - 'child/webcrypto/openssl/ecdsa_openssl.cc',
|
| - 'child/webcrypto/openssl/hkdf_openssl.cc',
|
| - 'child/webcrypto/openssl/hmac_openssl.cc',
|
| - 'child/webcrypto/openssl/key_openssl.cc',
|
| - 'child/webcrypto/openssl/key_openssl.h',
|
| - 'child/webcrypto/openssl/pbkdf2_openssl.cc',
|
| - 'child/webcrypto/openssl/rsa_hashed_algorithm_openssl.cc',
|
| - 'child/webcrypto/openssl/rsa_hashed_algorithm_openssl.h',
|
| - 'child/webcrypto/openssl/rsa_oaep_openssl.cc',
|
| - 'child/webcrypto/openssl/rsa_pss_openssl.cc',
|
| - 'child/webcrypto/openssl/rsa_sign_openssl.cc',
|
| - 'child/webcrypto/openssl/rsa_sign_openssl.h',
|
| - 'child/webcrypto/openssl/rsa_ssa_openssl.cc',
|
| - 'child/webcrypto/openssl/sha_openssl.cc',
|
| - 'child/webcrypto/openssl/util_openssl.cc',
|
| - 'child/webcrypto/openssl/util_openssl.h',
|
| - ],
|
| },
|
| 'sources': [
|
| '<@(public_child_sources)',
|
| @@ -411,29 +347,5 @@
|
| 'child/npapi/webplugin_delegate_impl_aura.cc',
|
| ],
|
| }],
|
| - ['use_openssl==1', {
|
| - 'sources': [
|
| - '<@(webcrypto_openssl_sources)',
|
| - ],
|
| - 'dependencies': [
|
| - '../third_party/boringssl/boringssl.gyp:boringssl',
|
| - ],
|
| - }, {
|
| - 'sources': [
|
| - '<@(webcrypto_nss_sources)',
|
| - ],
|
| - 'conditions': [
|
| - ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
|
| - 'dependencies': [
|
| - '../build/linux/system.gyp:ssl',
|
| - ],
|
| - }, {
|
| - 'dependencies': [
|
| - '../third_party/nss/nss.gyp:nspr',
|
| - '../third_party/nss/nss.gyp:nss',
|
| - ],
|
| - }],
|
| - ],
|
| - }],
|
| ],
|
| }
|
|
|