summaryrefslogtreecommitdiffstats
path: root/ui/keyboard/keyboard.gyp
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 16:54:04 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 16:54:04 +0000
commit15da2dd0882f922610a842b58778c0fc9a1f3b5e (patch)
treee1e3cbbae955286bbe0f466c42aebcc6ec871acc /ui/keyboard/keyboard.gyp
parente9c42b37faeddeb37de40b0b96074f177cf50114 (diff)
downloadchromium_src-15da2dd0882f922610a842b58778c0fc9a1f3b5e.zip
chromium_src-15da2dd0882f922610a842b58778c0fc9a1f3b5e.tar.gz
chromium_src-15da2dd0882f922610a842b58778c0fc9a1f3b5e.tar.bz2
ui: Break the dependency on run_ui_unittests target.
This makes three unit tests targets stop depending on run_ui_unittests target. By depending on it brings an indirect dependency on chrome/chrome_resources.gyp:packed_resources. And we don't want that. Instead we make these independent test targets load the test pak themselves, so they can depend only in ui_test.pak. BUG=144345 TEST=app_list_unittests, message_center_unittests, keyboard_unittests R=tony@chromium.org,xiyuan@chromium.org,sadrul@chromium.org,miket@chromium.org Review URL: https://codereview.chromium.org/143393003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard/keyboard.gyp')
-rw-r--r--ui/keyboard/keyboard.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp
index a9f41f9..fe685c8 100644
--- a/ui/keyboard/keyboard.gyp
+++ b/ui/keyboard/keyboard.gyp
@@ -90,11 +90,12 @@
'../compositor/compositor.gyp:compositor',
'../gfx/gfx.gyp:gfx',
'../gfx/gfx.gyp:gfx_geometry',
+ '../resources/ui_resources.gyp:ui_test_pak',
'../ui.gyp:ui',
- '../ui_unittests.gyp:run_ui_unittests',
'keyboard',
],
'sources': [
+ 'test/run_all_unittests.cc',
'keyboard_controller_unittest.cc',
],
'conditions': [