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

Unified Diff: net/net.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: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 31afc1747f8095f28be821bc1bd7798e4237c12f..abfd10333dafbb8ab9f847add434aaf6bcd5876c 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -9,7 +9,6 @@
'targets': [
{
'target_name': 'net',
- 'type': '<(component)',
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
@@ -794,6 +793,7 @@
},
],
[ 'OS == "win"', {
+ 'type': '<(component)',
'sources!': [
'http/http_auth_handler_ntlm_portable.cc',
'socket/tcp_client_socket_libevent.cc',
@@ -810,6 +810,7 @@
'tld_cleanup',
],
}, { # else: OS != "win"
+ 'type': 'static_library',
'sources!': [
'base/winsock_init.cc',
'base/winsock_init.h',
@@ -820,7 +821,7 @@
],
},
],
- [ 'component == "shared_library"', {
+ [ 'OS == "win" and component == "shared_library"', {
'defines': [
'NET_IMPLEMENTATION',
],
« chrome/browser/policy/cros_user_policy_cache.cc ('K') | « crypto/openpgp_symmetric_encryption.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698