Revert "Fix standalone compilation on Linux"

This broke Chromium build on Linux. This reverts commit c6a61c27. Change-Id: I4df380eaed3ecc19b85aa99a397968ceb5ce3af8 Reviewed-on: https://chromium-review.googlesource.com/276293Reviewed-by: Olli Etuaho <oetuaho@nvidia.com> Tested-by: Olli Etuaho <oetuaho@nvidia.com>

Revert "Fix standalone compilation on Linux"
7b6e7173 · Olli Etuaho · c6a61c27 · 7b6e7173
Commit 7b6e7173 authored Jun 10, 2015 by Olli Etuaho
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

angle.gyp src/angle.gyp +1 -4

No files found.
--- a/src/angle.gyp
+++ b/src/angle.gyp
@@ -26,10 +26,7 @@
                'angle_enable_d3d11%': 1,
                'angle_enable_hlsl%': 1,
            }],
-            # Gyp provides no way to make conditions depend on variables defined in the same
+            ['OS=="linux" and use_x11==1',
-            # variable block. In a standalone build, use_x11 is defined in this variable block
-            # (merged from an include) so we cannot test it, instead we enable GL unconditionnally.
-            ['OS=="linux" and (angle_standalone==1 or use_x11==1)',
            {
                'angle_enable_gl%': 1,
            }],