summaryrefslogtreecommitdiffstats
path: root/extensions/extensions.gyp
diff options
context:
space:
mode:
authorsergeyv <sergeyv@chromium.org>2015-01-21 07:27:39 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-21 15:28:39 +0000
commitf752426485290ebf878ef5af21b6335ad5a47141 (patch)
tree6c4273ea035fa474a4adbe38893f13b821d95c98 /extensions/extensions.gyp
parente98e8e7654b7e51f98e92514897f8e1284eaa571 (diff)
downloadchromium_src-f752426485290ebf878ef5af21b6335ad5a47141.zip
chromium_src-f752426485290ebf878ef5af21b6335ad5a47141.tar.gz
chromium_src-f752426485290ebf878ef5af21b6335ad5a47141.tar.bz2
Revert of Re-landing of issue 792353002 (patchset #1 id:1 of https://codereview.chromium.org/854693002/)
Reason for revert: Speculative revert. I suppose that now it is breaking Linux GN: http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/20625/steps/compile/logs/stdio Original issue's description: > The purpose of this CL is to re-land issue 792353002 (https://codereview.chromium.org/792353002/), which landed, but was reverted due to a ChromiumOS GN build failure. The failure was caused by a double inclusion of networking_private_credentials_getter_chromeos.cc.cc file in chrome_browser_extensions.gypi. This CL includes the original patch and the fix of the build failure. > > Original CL description follows: > > Refactoring of Cast-related crypto code to use the same certificate validation logic in chrome.networkingPrivate API and Cast Channel authentication. > > Here's what's being done here: > * Code from cast_auth_util_nss/openssl formed the basis a common Cast device validation component in /src/extensions/common/cast/cast_cert_validator*, and is now being extensively cleaned up in response to rsleevi's comments in this CL. > * Both networking_private_crypto* and cast_auth_util* have been updated to use the new common code. > * The current D-Bus-based implementation of VerifyDestination is going away per discussion with ChromeOS team, and is replaced with in-Chrome code in networking_private crypto*. > > BUG=442650 > > Committed: https://crrev.com/57988d1f46e6ce2a2d65aa87c01b29b2732a110f > Cr-Commit-Position: refs/heads/master@{#312369} TBR=rockot@chromium.org,stevenjb@chromium.org,brettw@chromium.org,mfoltz@chromium.org,vadimgo@chromium.org,mef@chromium.org,kmarshall@chromium.org,rsleevi@chromium.org,sheretov@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=442650 Review URL: https://codereview.chromium.org/865583003 Cr-Commit-Position: refs/heads/master@{#312391}
Diffstat (limited to 'extensions/extensions.gyp')
-rw-r--r--extensions/extensions.gyp53
1 files changed, 26 insertions, 27 deletions
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index 1015f9f..1d3a8c9 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -84,8 +84,6 @@
'common/api/sockets/sockets_manifest_handler.h',
'common/api/sockets/sockets_manifest_permission.cc',
'common/api/sockets/sockets_manifest_permission.h',
- 'common/cast/cast_cert_validator.cc',
- 'common/cast/cast_cert_validator.h',
'common/common_manifest_handlers.cc',
'common/common_manifest_handlers.h',
'common/csp_validator.cc',
@@ -283,31 +281,6 @@
'common/manifest_handlers/nacl_modules_handler.h',
],
}],
- ['use_openssl==1', {
- 'sources': [
- 'common/cast/cast_cert_validator_openssl.cc',
- ],
- 'dependencies': [
- '../third_party/boringssl/boringssl.gyp:boringssl',
- ],
- }, {
- 'sources': [
- 'common/cast/cast_cert_validator_nss.cc',
- ],
- 'conditions': [
- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
- 'dependencies': [
- '../build/linux/system.gyp:ssl',
- ],
- }],
- ['OS == "mac" or OS == "ios" or OS == "win"', {
- 'dependencies': [
- '../third_party/nss/nss.gyp:nspr',
- '../third_party/nss/nss.gyp:nss',
- ],
- }],
- ],
- }],
],
},
{
@@ -859,6 +832,32 @@
'browser/api/vpn_provider/vpn_service_factory.h'
]
}],
+ ['use_openssl==1', {
+ 'sources': [
+ 'browser/api/cast_channel/cast_auth_util_openssl.cc',
+ ],
+ 'dependencies': [
+ '../third_party/boringssl/boringssl.gyp:boringssl',
+ ],
+ }, {
+ 'sources': [
+ # cast_auth_util_nss.cc uses NSS functions.
+ 'browser/api/cast_channel/cast_auth_util_nss.cc',
+ ],
+ 'conditions': [
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:ssl',
+ ],
+ }],
+ ['OS == "mac" or OS == "ios" or OS == "win"', {
+ 'dependencies': [
+ '../third_party/nss/nss.gyp:nspr',
+ '../third_party/nss/nss.gyp:nss',
+ ],
+ }],
+ ],
+ }],
['OS != "linux"', {
'sources': [
'browser/api/audio/audio_service.cc',