diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 22:22:10 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 22:22:10 +0000 |
| commit | 23bb71fb2a8d32adb4f5d9baf36a6b17c2111fa9 (patch) | |
| tree | 39abb0de36acc80ae452d45d57504242d980536e /base/base.gyp | |
| parent | 25b63dbaa7974ee2f62928790139611adfae1bad (diff) | |
| download | chromium_src-23bb71fb2a8d32adb4f5d9baf36a6b17c2111fa9.zip chromium_src-23bb71fb2a8d32adb4f5d9baf36a6b17c2111fa9.tar.gz chromium_src-23bb71fb2a8d32adb4f5d9baf36a6b17c2111fa9.tar.bz2 | |
Base: More adjustments to BASE_API and project dependencies to
use base.dll from chrome.
BUG=76996
TEST=none
Review URL: http://codereview.chromium.org/6877053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/base/base.gyp b/base/base.gyp index 682eacf..85fc58f 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -55,7 +55,8 @@ }, { # This is the subset of files from base that should not be used with a - # dynamic library. + # dynamic library. Note that this library cannot depend on base because + # base depends on base_static. 'target_name': 'base_static', 'type': '<(library)', 'sources': [ @@ -221,6 +222,7 @@ 'base_i18n', 'base_static', 'test_support_base', + 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', ], @@ -279,10 +281,14 @@ 'type': '<(library)', 'dependencies': [ 'base', + 'base_static', 'base_i18n', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', ], + 'export_dependent_settings': [ + 'base', + ], 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ |