summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-22 01:29:15 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-22 01:29:15 +0000
commit841c523f75dd0fae0d178b84b1b9f438354dab20 (patch)
tree1cedd2ccaeb5c55b500f33a50c330f7f7021af41 /chrome/chrome.gyp
parenteefb825d985fe3b8a4c74b30a0509e5123649452 (diff)
downloadchromium_src-841c523f75dd0fae0d178b84b1b9f438354dab20.zip
chromium_src-841c523f75dd0fae0d178b84b1b9f438354dab20.tar.gz
chromium_src-841c523f75dd0fae0d178b84b1b9f438354dab20.tar.bz2
Try to fix the ChromeOS build. This tries to add a views dependency for browser_tests, and fixes some simple errors in the focus unit test.
Review URL: http://codereview.chromium.org/173243 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 60864b6..af32d9f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -5115,6 +5115,11 @@
'../build/linux/system.gyp:gtk',
],
}],
+ ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
+ 'dependencies': [
+ '../views/views.gyp:views',
+ ],
+ }],
['OS=="mac"', {
# The test fetches resources which means Mac need the app bundle to
# exist on disk so it can pull from it.