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

Unified Diff: crypto/crypto.gyp

Issue 7233006: Store/Retrieve CrOS user policy in session_manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fix Created 9 years, 5 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
Index: crypto/crypto.gyp
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index f660e4cd0eede118e73f723cbc0e55a535dbce82..7a31e8475dba4e4fc77e8e4906b9c1d874d0aa56 100644
--- a/crypto/crypto.gyp
+++ b/crypto/crypto.gyp
@@ -9,7 +9,6 @@
'targets': [
{
'target_name': 'crypto',
- 'type': '<(component)',
'product_name': 'crcrypto', # Avoid colliding with OpenSSL's libcrypto
'dependencies': [
'../base/base.gyp:base',
@@ -68,13 +67,16 @@
'../third_party/nss/nss.gyp:nss',
],
}],
- [ 'OS != "win"', {
+ [ 'OS == "win"', {
+ 'type': '<(component)',
+ }, { # else OS != "win"
+ 'type': 'static_library',
'sources!': [
'capi_util.h',
'capi_util.cc',
],
}],
- [ 'component == "shared_library"', {
+ [ 'OS == "win" and component == "shared_library"', {
'defines': [
'CRYPTO_IMPLEMENTATION',
],

Powered by Google App Engine
This is Rietveld 408576698