summaryrefslogtreecommitdiffstats
path: root/remoting
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 /remoting
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 'remoting')
-rw-r--r--remoting/remoting.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 49388ab..88d8266 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -124,7 +124,7 @@
'target_name': 'chromoting_base',
'type': '<(library)',
'dependencies': [
- '../ui/gfx/gfx.gyp:gfx',
+ '../ui/ui.gyp:ui_gfx',
'../media/media.gyp:media',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'../third_party/libvpx/libvpx.gyp:libvpx_include',
@@ -512,7 +512,7 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
- '../ui/gfx/gfx.gyp:gfx',
+ '../ui/ui.gyp:ui_gfx',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
],