Disable angle_enable_gl on chromeos

BUG=angleproject:1370 Change-Id: I63e3ee8fc6e08fcd2a908cdca3558af886526cbd Reviewed-on: https://chromium-review.googlesource.com/342740Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Disable angle_enable_gl on chromeos
369d03c1 · Steven Bennetts · Commit Bot · f691cfab · 369d03c1 · 369d03c1
Commit 369d03c1 authored May 05, 2016 by Steven Bennetts Committed by Commit Bot May 06, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

BUILD.gn BUILD.gn +3 -3

angle_common.gni build/angle_common.gni +3 -1

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -224,9 +224,9 @@ config("libANGLE_config") {
  }
  if (angle_enable_gl) {
    defines += [ "ANGLE_ENABLE_OPENGL" ]
-  }
-  if (use_x11) {
-    defines += [ "ANGLE_USE_X11" ]
+    if (use_x11) {
+      defines += [ "ANGLE_USE_X11" ]
+    }
  }
  defines += [
    "GL_GLEXT_PROTOTYPES",

--- a/build/angle_common.gni
+++ b/build/angle_common.gni
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

+import("//build/config/ui.gni")  # import the use_x11 variable
+
 angle_enable_d3d9 = false
 angle_enable_d3d11 = false
 angle_enable_gl = false
@@ -14,7 +16,7 @@ if (is_win) {
  import("//build/config/win/visual_studio_version.gni")
 } # is_win

-if (is_linux) {
+if (is_linux && use_x11 && !is_chromeos) {
  angle_enable_gl = true
 }