encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUILD.gn: Correctly skip GLFW on ChromeOS 

ChromeOS has is_linux = true so the code to skip compiling GLFW on
ChromeOS didn't work correctly.

BUG=dawn:221
BUG=chromium:1002895

Change-Id: Ifbf8527407ad20b4368531da1d7653ce620d37be
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/11200
Reviewed-by: Mitsuru Oshima <oshima@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
Corentin Wallez 2019-09-12 16:33:31 +00:00 committed by Commit Bot service account
parent 47f3b0da28
commit 785ec66b66
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -583,7 +583,7 @@ dawn_component("libdawn_wire") {
# GLFW does not support ChromeOS, Android or Fuchsia, so provide a small mock # GLFW does not support ChromeOS, Android or Fuchsia, so provide a small mock
# library that can be linked into the Dawn tests on these platforms. Otherwise, # library that can be linked into the Dawn tests on these platforms. Otherwise,
# use the real library from third_party/. # use the real library from third_party/.
if (is_win || is_linux || is_mac) { if (is_win || (is_linux && !is_chromeos) || is_mac) {
group("dawn_glfw") { group("dawn_glfw") {
public_deps = [ public_deps = [
"third_party:glfw", "third_party:glfw",

2
third_party/BUILD.gn vendored
View File

@ -234,7 +234,7 @@ if (!build_with_chromium) {
# Only expose GLFW targets on platforms where GLFW is supported: otherwise they # Only expose GLFW targets on platforms where GLFW is supported: otherwise they
# might get discovered by GN when another target in this file is referenced, # might get discovered by GN when another target in this file is referenced,
# and GLFW will bbe built as part of "all" builds, causing compilation failures. # and GLFW will bbe built as part of "all" builds, causing compilation failures.
if (is_win || is_linux || is_mac) { if (is_win || (is_linux && !is_chromeos) || is_mac) {
glfw_dir = dawn_glfw_dir glfw_dir = dawn_glfw_dir
config("glfw_public") { config("glfw_public") {