From ed321c69d78b48bcd51c4b883c1e2a69832664a6 Mon Sep 17 00:00:00 2001
From: "rvargas@google.com"
 <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 26 Apr 2011 21:54:28 +0000
Subject: Base: Adjust dependencies to build with base.dll

BUG=76996
TEST=none
Review URL: http://codereview.chromium.org/6894040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83082 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/support/webkit_support.gypi      | 7 ++++++-
 webkit/tools/test_shell/test_shell.gypi | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'webkit')

diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index f86b821..bc46f95 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -11,6 +11,7 @@
       'target_name': 'webkit_support',
       'type': '<(library)',
       'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/ui/ui.gyp:ui_gfx',
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/skia/skia.gyp:skia',
@@ -73,10 +74,14 @@
       'target_name': 'webkit_support_common',
       'type': '<(library)',
       'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/crypto/crypto.gyp:crypto',
         '<(DEPTH)/skia/skia.gyp:skia',
         'glue',
       ],
+      'export_dependent_settings': [
+        '<(DEPTH)/base/base.gyp:base',
+      ],
       'sources': [
         '<(DEPTH)/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h',
         '<(DEPTH)/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m',
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index d843493..bdbc356 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -526,6 +526,9 @@
             '../../plugins/npapi/test/plugin_test.h',
             '../../plugins/npapi/test/plugin_test_factory.h',
           ],
+          'export_dependent_settings': [
+            '<(DEPTH)/base/base.gyp:base',
+          ],
         },
         {
           'target_name': 'npapi_test_plugin',
-- 
cgit v1.1