diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 21:54:28 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 21:54:28 +0000 |
| commit | ed321c69d78b48bcd51c4b883c1e2a69832664a6 (patch) | |
| tree | 31af7618a84e0cea490ada043664f231a6188a41 /webkit | |
| parent | 4e1c6cfe7aa7a281f6f6ce5006bef6ade08dc685 (diff) | |
| download | chromium_src-ed321c69d78b48bcd51c4b883c1e2a69832664a6.zip chromium_src-ed321c69d78b48bcd51c4b883c1e2a69832664a6.tar.gz chromium_src-ed321c69d78b48bcd51c4b883c1e2a69832664a6.tar.bz2 | |
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
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/support/webkit_support.gypi | 7 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 3 |
2 files changed, 9 insertions, 1 deletions
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', |