commit 7929b6116e249527a551a4eae08ee677d4743070
author David 'Digit' Turner <digit@google.com> Fri Jun 21 19:12:14 2019 +0200
committer David Turner <digit@google.com> Thu Jul 11 14:01:23 2019 +0000
tree 2f2a2c17103a64df7b73c63379853b702cbf26f6
parent 28eb18c450280e15a9706734c283ac83baa17e9c

[build] Use upstream Khronos GN target names and paths.

Use the new GN target paths and names introduced by [1]
to prepare for the upgrade of spirv/glslang/shaderc repositories.
Note that this still builds exactly the same source files!

See associated bug entries to understand why this is needed.

[1] https://fuchsia-review.googlesource.com/c/fuchsia/+/295913

BUG: MA-640
TEST: Build file changes only, should not impact the build.

Change-Id: Id306fc9da451e82efa9d3e857b8296822a4bb5b1

layers/BUILD.gn

diff --git a/layers/BUILD.gn b/layers/BUILD.gn
index 04f202c..2da7d20 100644
--- a/layers/BUILD.gn
+++ b/layers/BUILD.gn
@@ -133,10 +133,6 @@
 
 validation_layer("libVkLayer_core_validation") {
   cflags_cc = [ "-Wno-missing-field-initializers" ]
-  include_dirs = [
-    "//third_party/shaderc/third_party/spirv-tools/include",
-    "//third_party/shaderc/third_party/glslang",
-  ]
   sources = [
     "buffer_validation.cpp",
     "core_validation.cpp",
@@ -147,8 +143,9 @@
   ]
   deps = [
     ":layer_common",
-    "//third_party/shaderc/third_party/glslang",
-    "//third_party/shaderc/third_party/spirv-tools",
+    "//third_party/glslang:glslang_sources",
+    "//third_party/spirv-tools:SPIRV-Tools",
+    "//third_party/spirv-tools:spvtools_headers",
   ]
 }
 

tests/BUILD.gn

diff --git a/tests/BUILD.gn b/tests/BUILD.gn
index e102d60..7bf8035 100644
--- a/tests/BUILD.gn
+++ b/tests/BUILD.gn
@@ -39,7 +39,6 @@
     # "gtest-1.7.0",
     # "gtest-1.7.0/include",
     "//third_party/glm",
-    "//third_party/shaderc/third_party/glslang",
   ]
 }
 
@@ -70,9 +69,7 @@
   public_deps = [
     "../:extra_vulkan_headers",
     "../:vulkan",
-    "//third_party/shaderc/third_party/glslang",
-    "//third_party/shaderc/third_party/glslang:SPIRV",
-    "//third_party/shaderc/third_party/glslang:SPVRemapper",
+    "//third_party/glslang:glslang_sources",
   ]
   configs += [ ":validation_tests_optimization" ]
 }