From 7ade185c6a6c24d940c902270521209707f56617 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 17 Jul 2017 13:40:47 +0200
Subject: Do not build swiftshader when it is disabled

Change-Id: Id51f271047aa03d5480e93835c90a7b0b91bd516
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 chromium/ui/gl/BUILD.gn     | 6 +++---
 chromium/ui/gl/features.gni | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'chromium/ui')

diff --git a/chromium/ui/gl/BUILD.gn b/chromium/ui/gl/BUILD.gn
index 933a9eb1d0c..1c002f7482e 100644
--- a/chromium/ui/gl/BUILD.gn
+++ b/chromium/ui/gl/BUILD.gn
@@ -18,8 +18,6 @@ declare_args() {
   enable_gpu_service_logging = false
 }
 
-use_glx = use_x11 || ozone_platform_x11
-
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
@@ -348,8 +346,10 @@ component("gl") {
     data_deps += [
       "//third_party/angle:libEGL",
       "//third_party/angle:libGLESv2",
-      "//third_party/swiftshader",
     ]
+    if (enable_swiftshader) {
+      data_deps += [ "//third_party/swiftshader" ]
+    }
   }
   if (is_mac) {
     sources += [
diff --git a/chromium/ui/gl/features.gni b/chromium/ui/gl/features.gni
index 9c949825fa4..5fdce595180 100644
--- a/chromium/ui/gl/features.gni
+++ b/chromium/ui/gl/features.gni
@@ -2,6 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chrome_build.gni")
+import("//build/config/ui.gni")
+import("//ui/ozone/ozone.gni")
+
 import("//build/config/chromecast_build.gni")
 import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/chromeos/ui_mode.gni")
@@ -32,3 +36,5 @@ declare_args() {
                         target_cpu == "arm" || target_cpu == "arm64" ||
                         target_cpu == "mipsel" || target_cpu == "mips64el")
 }
+
+use_glx = use_x11 || ozone_platform_x11
-- 
cgit v1.2.1