summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 21:54:28 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 21:54:28 +0000
commited321c69d78b48bcd51c4b883c1e2a69832664a6 (patch)
tree31af7618a84e0cea490ada043664f231a6188a41 /app
parent4e1c6cfe7aa7a281f6f6ce5006bef6ade08dc685 (diff)
downloadchromium_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 'app')
-rw-r--r--app/app_base.gypi5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi
index db8cceb..873cbb0 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -62,6 +62,7 @@
# target, but it doesn't work due to a bug in gyp
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
+ '../base/base.gyp:base_static',
'../ui/ui.gyp:ui_gfx',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
@@ -73,6 +74,10 @@
'../ui/base/strings/ui_strings.gyp:ui_strings',
'<(libjpeg_gyp_path):libjpeg',
],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_static',
+ ],
# TODO(gregoryd): The direct_dependent_settings should be shared with
# the 64-bit target, but it doesn't work due to a bug in gyp
'direct_dependent_settings': {