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 /chrome_frame | |
| 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 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 8 | ||||
| -rw-r--r-- | chrome_frame/crash_reporting/crash_reporting.gyp | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 7674ed8..b454c51 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -849,7 +849,13 @@ 'sync_msg_reply_dispatcher.cc', 'task_marshaller.h', 'task_marshaller.cc', - ] + ], + 'dependencies': [ + '../base/base.gyp:base', + ], + 'export_dependent_settings': [ + '../base/base.gyp:base', + ], }, { 'target_name': 'npchrome_frame', diff --git a/chrome_frame/crash_reporting/crash_reporting.gyp b/chrome_frame/crash_reporting/crash_reporting.gyp index 2ec1eb0..2f631dc 100644 --- a/chrome_frame/crash_reporting/crash_reporting.gyp +++ b/chrome_frame/crash_reporting/crash_reporting.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2009 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. @@ -26,6 +26,9 @@ 'vectored_handler-impl.h', 'vectored_handler.h', ], + 'dependencies': [ + '../../base/base.gyp:base', + ], 'conditions': [ ['OS=="win"', { 'dependencies': [ |