summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 19:00:37 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 19:00:37 +0000
commitdcf29616d0390738f5c36ad344f7d28f37a916f6 (patch)
tree1f968965f2322e80a7572da034bee2cc94297d48 /chrome
parent785993e730139a6c5a93b69ca4dfdc313db59895 (diff)
downloadchromium_src-dcf29616d0390738f5c36ad344f7d28f37a916f6.zip
chromium_src-dcf29616d0390738f5c36ad344f7d28f37a916f6.tar.gz
chromium_src-dcf29616d0390738f5c36ad344f7d28f37a916f6.tar.bz2
Added mesa dependency to ui_tests and chrome_tests.
Missed from r64122. I think this is why GPUTest.UITestLaunchedWithOSMesa failed on linux. TEST=try BUG=none Review URL: http://codereview.chromium.org/4108005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome_tests.gypi4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 979b9e7..bb2f0f1 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -456,6 +456,7 @@
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libxml/libxml.gyp:libxml',
# run time dependencies
+ 'chrome_mesa',
'default_plugin/default_plugin.gyp:default_plugin',
'../third_party/ppapi/ppapi.gyp:ppapi_tests',
'../webkit/support/webkit_support.gyp:copy_npapi_layout_test_plugin',
@@ -523,7 +524,6 @@
# http://code.google.com/p/chromium/issues/detail?id=18337
['target_arch!="x64" and target_arch!="arm"', {
'dependencies': [
- 'chrome_mesa',
'../webkit/webkit.gyp:copy_npapi_test_plugin',
],
}],
@@ -1847,6 +1847,8 @@
'../testing/gtest.gyp:gtest',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
+ # Runtime dependencies
+ 'chrome_mesa',
],
'include_dirs': [
'..',