summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 17:54:31 +0000
committerkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 17:54:31 +0000
commitbab9cc745a6d005329a72b855117b568bb375c49 (patch)
treeafce7533d34d78611816e65d7006496ae510d2f8 /media
parent70443c701f0f354abb171250f73d2a8d830b559d (diff)
downloadchromium_src-bab9cc745a6d005329a72b855117b568bb375c49.zip
chromium_src-bab9cc745a6d005329a72b855117b568bb375c49.tar.gz
chromium_src-bab9cc745a6d005329a72b855117b568bb375c49.tar.bz2
Remove shader_bench from "make all" target on ChromeOS.
The current gyp drops shader_bench target only when OS!=mac. But it also fails to link on other "!win and !gtk" environments. This patch removes the target on such configuration. BUG=none TEST=manually check that GYP_DEFINES="chromeos=1"'ed ninja all didn't fail at shader_bench Review URL: http://codereview.chromium.org/9942005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130057 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/media.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 21d5399..a11e2d0 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -816,7 +816,7 @@
},
],
}],
- ['OS!="mac"', {
+ ['OS == "win" or toolkit_uses_gtk == 1', {
'targets': [
{
'target_name': 'shader_bench',