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

Unified Diff: content/content_renderer.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/content_child.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_renderer.gypi
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 26001c0dec3cfeafbe71e6381a0b1252d3b9f59d..b8a8034829dc4e6776d2df106ba313d06e895b3a 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -522,18 +522,6 @@
'renderer/web_ui_extension_data.h',
'renderer/webclipboard_impl.cc',
'renderer/webclipboard_impl.h',
- 'renderer/webcrypto/crypto_data.cc',
- 'renderer/webcrypto/crypto_data.h',
- 'renderer/webcrypto/jwk.cc',
- 'renderer/webcrypto/platform_crypto.h',
- 'renderer/webcrypto/platform_crypto_nss.cc',
- 'renderer/webcrypto/platform_crypto_openssl.cc',
- 'renderer/webcrypto/shared_crypto.cc',
- 'renderer/webcrypto/shared_crypto.h',
- 'renderer/webcrypto/webcrypto_impl.cc',
- 'renderer/webcrypto/webcrypto_impl.h',
- 'renderer/webcrypto/webcrypto_util.cc',
- 'renderer/webcrypto/webcrypto_util.h',
'renderer/webgraphicscontext3d_provider_impl.cc',
'renderer/webgraphicscontext3d_provider_impl.h',
'renderer/webpublicsuffixlist_impl.cc',
@@ -766,30 +754,6 @@
'renderer/media/crypto/ppapi_decryptor.h',
],
}],
- ['use_openssl==1', {
- 'sources!': [
- 'renderer/webcrypto/platform_crypto_nss.cc',
- ],
- 'dependencies': [
- '../third_party/openssl/openssl.gyp:openssl',
- ],
- }, {
- 'sources!': [
- 'renderer/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',
- ],
- }],
- ],
- }],
],
'target_conditions': [
['OS=="android"', {
« no previous file with comments | « content/content_child.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698