summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcwallez <cwallez@chromium.org>2015-06-18 15:43:50 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-18 22:44:20 +0000
commit8e1e026913c6717bfd7f399dbcbe249692e2920a (patch)
tree5fecb505cbf2c15baff9f0429dc05e9f8864670b
parent73564a5384e8ae088e72d120d7a92ba3683d6b8e (diff)
downloadchromium_src-8e1e026913c6717bfd7f399dbcbe249692e2920a.zip
chromium_src-8e1e026913c6717bfd7f399dbcbe249692e2920a.tar.gz
chromium_src-8e1e026913c6717bfd7f399dbcbe249692e2920a.tar.bz2
Enable compilation of angle_end2end_tests on Linux
So that we can run it on the GPU FYI bots on Linux BUG=501604 Review URL: https://codereview.chromium.org/1193743002 Cr-Commit-Position: refs/heads/master@{#335149}
-rw-r--r--gpu/gpu.gyp6
1 files changed, 5 insertions, 1 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 4e9a76c..52c8139 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -706,7 +706,7 @@
},
],
}],
- ['OS == "win"', {
+ ['OS == "win" or OS == "linux"', {
'targets': [
{
# TODO(kbr): port this target to the GN build.
@@ -724,6 +724,10 @@
'angle_end2end_tests_main.cc',
],
},
+ ],
+ }],
+ ['OS == "win"', {
+ 'targets': [
{
# TODO(jmadill): port this target to the GN build.
'target_name': 'angle_perftests',