summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-20 18:10:07 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-20 18:10:07 +0000
commitd275b1951ee05c7325901a433fa7a58f04797221 (patch)
treebe8c5cca3d8dcac13baa93b22b049b80c5a5e63c /webkit/support
parent9db6433c6502bbb0acc812c70e00af9823284968 (diff)
downloadchromium_src-d275b1951ee05c7325901a433fa7a58f04797221.zip
chromium_src-d275b1951ee05c7325901a433fa7a58f04797221.tar.gz
chromium_src-d275b1951ee05c7325901a433fa7a58f04797221.tar.bz2
Remove files that are compiled in both ui_base and app_base.
This causes problems when linking because there are duplicate symbols when the same file is compiled into two libs. Previously we were letting the linker collapse these, but that's slow and will start throwing errors once gyp is rolled. Review URL: http://codereview.chromium.org/7040022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
-rw-r--r--webkit/support/webkit_support.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index 047c686..5512578 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -77,6 +77,7 @@
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/crypto/crypto.gyp:crypto',
'<(DEPTH)/skia/skia.gyp:skia',
+ '<(DEPTH)/ui/ui.gyp:ui_base',
'glue',
],
'export_dependent_settings': [