From 7c99f16d6e0ac2c3802067dadb919496a387b16f Mon Sep 17 00:00:00 2001
From: "akalin@chromium.org"
 <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 11 May 2010 19:12:38 +0000
Subject: Added win-specific direct-dependent settings to libjingle.gyp.

BUG=none
TEST=trybots

Review URL: http://codereview.chromium.org/2042010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46946 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/sync/tools/sync_tools.gyp | 11 -----------
 third_party/libjingle/libjingle.gyp      |  8 ++++++++
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/chrome/browser/sync/tools/sync_tools.gyp b/chrome/browser/sync/tools/sync_tools.gyp
index 53fcc9f..792bfbe 100644
--- a/chrome/browser/sync/tools/sync_tools.gyp
+++ b/chrome/browser/sync/tools/sync_tools.gyp
@@ -24,17 +24,6 @@
         '<(DEPTH)/third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         '<(DEPTH)/third_party/libjingle/libjingle.gyp:libjingle',
       ],
-      # TODO(akalin): Figure out the right place to put this.
-      'conditions': [
-        ['OS=="win"', {
-          'link_settings': {
-            'libraries': [
-              '-lsecur32.lib',
-              '-lcrypt32.lib',
-            ],
-          },
-        },],
-      ],
     },
   ],
 }
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index f501c6c..7b8b0a3 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -28,6 +28,14 @@
         'FEATURE_ENABLE_VOICEMAIL',
       ],
       'conditions': [
+        ['OS=="win"', {
+          'link_settings': {
+            'libraries': [
+              '-lsecur32.lib',
+              '-lcrypt32.lib',
+            ],
+          },
+        }],
         ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
           'defines': [
             'POSIX',
-- 
cgit v1.1