summaryrefslogtreecommitdiffstats
path: root/build/all.gyp
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 /build/all.gyp
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 'build/all.gyp')
-rw-r--r--build/all.gyp14
1 files changed, 7 insertions, 7 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 633fa8cd..fcebd49 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -13,7 +13,7 @@
'../base/base.gyp:*',
'../chrome/browser/sync/tools/sync_tools.gyp:*',
'../chrome/chrome.gyp:*',
- '../ui/gfx/gfx.gyp:*',
+ '../ui/ui.gyp:*',
'../gpu/gpu.gyp:*',
'../gpu/demos/demos.gyp:*',
'../ipc/ipc.gyp:*',
@@ -156,7 +156,7 @@
'../chrome/chrome.gyp:sync_unit_tests',
'../chrome/chrome.gyp:ui_tests',
'../chrome/chrome.gyp:unit_tests',
- '../ui/gfx/gfx.gyp:gfx_unittests',
+ '../ui/ui.gyp:gfx_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:notifier_unit_tests',
@@ -261,7 +261,7 @@
'../chrome/chrome.gyp:sync_unit_tests',
'../chrome/chrome.gyp:ui_tests',
'../chrome/chrome.gyp:unit_tests',
- '../ui/gfx/gfx.gyp:gfx_unittests',
+ '../ui/ui.gyp:gfx_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:notifier_unit_tests',
@@ -291,7 +291,7 @@
'../chrome/chrome.gyp:ui_tests',
'../chrome/chrome.gyp:unit_tests',
'../chrome/chrome.gyp:url_fetch_test',
- '../ui/gfx/gfx.gyp:gfx_unittests',
+ '../ui/ui.gyp:gfx_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:notifier_unit_tests',
@@ -333,7 +333,7 @@
'../chrome/chrome.gyp:sync_unit_tests',
'../chrome/chrome.gyp:unit_tests',
'../chrome/chrome.gyp:ui_tests',
- '../ui/gfx/gfx.gyp:gfx_unittests',
+ '../ui/ui.gyp:gfx_unittests',
'../jingle/jingle.gyp:notifier_unit_tests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
],
@@ -377,7 +377,7 @@
'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
'../courgette/courgette.gyp:courgette_unittests',
- '../ui/gfx/gfx.gyp:gfx_unittests',
+ '../ui/ui.gyp:gfx_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:notifier_unit_tests',
@@ -479,7 +479,7 @@
'../chrome/chrome.gyp:ui_tests',
'../chrome/chrome.gyp:unit_tests',
'../chrome/chrome.gyp:url_fetch_test',
- '../ui/gfx/gfx.gyp:gfx_unittests',
+ '../ui/ui.gyp:gfx_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:notifier_unit_tests',
'../media/media.gyp:ffmpeg_tests',