Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(382)

Unified Diff: gpu/gpu.gyp

Issue 1193743002: Enable compilation of angle_end2end_tests on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 4e9a76c6d26d507814a55017b9c659e87218d75d..7a4a4c0e2e5694b9552eafc534ed8e3958214010 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -706,7 +706,7 @@
},
],
}],
- ['OS == "win"', {
+ ['OS == "win" or (OS == "linux" and use_x11)', {
'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',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698