summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-18 17:24:39 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-18 17:24:39 +0000
commit6ecdfa3f5a6fcc570a18c789389b1c8cdf294c04 (patch)
tree8ff1d930f92e36b364c45251791dbc2b27caf0cc /webkit/tools
parent7f036f8e35fc23141788448a0d1a37df695135e6 (diff)
downloadchromium_src-6ecdfa3f5a6fcc570a18c789389b1c8cdf294c04.zip
chromium_src-6ecdfa3f5a6fcc570a18c789389b1c8cdf294c04.tar.gz
chromium_src-6ecdfa3f5a6fcc570a18c789389b1c8cdf294c04.tar.bz2
Normalize the top-level ui/ module.
This CL creates four .gypi files that are included in /ui/ui.gyp. This allows for a single unittest binary for all the submodules, rather than having individual unittest binaries for each submodule. To not break the buildbot, this creates a fake target that copies ui_unittests to gfx_unittests as temporary scaffolding. BUG=72317 TEST=gfx_unittests (really ui_unittests) passes Review URL: http://codereview.chromium.org/6688007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_shell.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 67c2cbb..377d3d4 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -323,7 +323,7 @@
],
}, { # OS != "mac"
'dependencies': [
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx_resources',
+ '<(DEPTH)/ui/ui.gyp:gfx_resources',
'<(DEPTH)/net/net.gyp:net_resources',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',