Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(439)

Unified Diff: content/content_child.gypi

Issue 188203003: Move webcrypto to child/ and add support to worker_webkitplatformsupport. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes to gypis Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/webkitplatformsupport_impl.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_child.gypi
diff --git a/content/content_child.gypi b/content/content_child.gypi
index 45d9fe80a9bcedb25c26159c61559a6b58a3b1a3..0c10b50c8df5cbfd4ee826119c070b0768e99b5f 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -165,6 +165,18 @@
'child/web_url_loader_impl.h',
'child/webblobregistry_impl.cc',
'child/webblobregistry_impl.h',
+ 'child/webcrypto/crypto_data.cc',
+ 'child/webcrypto/crypto_data.h',
+ 'child/webcrypto/jwk.cc',
+ '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/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',
@@ -242,5 +254,29 @@
'child/npapi/webplugin_delegate_impl_aura.cc',
],
}],
+ ['use_openssl==1', {
+ 'sources!': [
+ 'child/webcrypto/platform_crypto_nss.cc',
+ ],
+ 'dependencies': [
+ '../third_party/openssl/openssl.gyp:openssl',
+ ],
+ }, {
+ 'sources!': [
+ 'child/webcrypto/platform_crypto_openssl.cc',
+ ],
+ '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',
+ ],
+ }],
+ ],
+ }],
],
}
« no previous file with comments | « content/child/webkitplatformsupport_impl.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698