commit d92d035e00cbb22d94ecb86ee5b20b04ed3a7258
author Chinmay Garde <chinmaygarde@google.com> Mon Sep 17 10:23:28 2018 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Sep 17 19:15:49 2018 +0000
tree f3316f61c160b2b60b4124a283604504d9608cb3
parent 0944ae8afbafaae30eacffc73c5afbf4c062210c

Allow users of Skia to optionally link against X11 and GL on Linux.

Change-Id: Id46986c0c7865d1877766e1584550e0b9e1af6c2
Reviewed-on: https://skia-review.googlesource.com/154803
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index e03fe06..f84dbae 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -31,6 +31,7 @@
   skia_use_zlib = true
   skia_use_metal = false
   skia_use_libheif = is_skia_dev_build
+  skia_use_x11 = is_linux
 
   skia_android_serial = ""
   skia_enable_discrete_gpu = true
@@ -599,7 +600,7 @@
   } else if (skia_use_egl) {
     sources += [ "src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp" ]
     libs += [ "EGL" ]
-  } else if (is_linux) {
+  } else if (is_linux && skia_use_x11) {
     sources += [ "src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp" ]
     libs += [ "GL" ]
   } else if (is_mac) {