commit a194a939525cbff2820714d0fc3d12f5748c4c84
author Tobin Ehlis <tobine@google.com> Fri May 17 13:52:21 2019 -0600
committer Tobin Ehlis <tobine@google.com> Fri May 17 16:04:25 2019 -0600
tree 4f04a5d19c5d359fb2543580a028d68b04b2194f
parent 852a9b4210e105a88cf4e291923cb61b24cea3c0

build:Modify spirv/glslang dir variable names

The chromium build has multiple dependencies that reference the glslang
and spirv-tools dir. Adding "vvl_" prefix to these dirs here to avoid
name collisions.

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 88a7e86..b463f2d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -230,7 +230,7 @@
   }
 }
 
-raw_spirv_tools_dir = rebase_path("${spirv_tools_dir}", root_build_dir)
+raw_spirv_tools_dir = rebase_path("${vvl_spirv_tools_dir}", root_build_dir)
 
 spirv_git_is_present = exec_script("build-gn/commit_id.py",
                                    [
@@ -243,9 +243,9 @@
 action("spirv_tools_external_revision_generate") {
   script = "scripts/external_revision_generator.py"
   public_deps = [
-    "${spirv_tools_dir}:spvtools",
-    "${spirv_tools_dir}:spvtools_opt",
-    "${spirv_tools_dir}:spvtools_val",
+    "${vvl_spirv_tools_dir}:spvtools",
+    "${vvl_spirv_tools_dir}:spvtools_opt",
+    "${vvl_spirv_tools_dir}:spvtools_val",
   ]
   outputs = [
     "$vulkan_gen_dir/spirv_tools_commit_id.h",
@@ -481,14 +481,14 @@
 }
 
 config("vulkan_core_validation_config") {
-  include_dirs = [ "$glslang_dir" ]
+  include_dirs = [ "$vvl_glslang_dir" ]
 }
 
 source_set("vulkan_core_validation_glslang") {
   public_deps = [
-    "${spirv_tools_dir}:spvtools",
-    "${spirv_tools_dir}:spvtools_opt",
-    "${spirv_tools_dir}:spvtools_val",
+    "${vvl_spirv_tools_dir}:spvtools",
+    "${vvl_spirv_tools_dir}:spvtools_opt",
+    "${vvl_spirv_tools_dir}:spvtools_val",
   ]
   public_configs = [
     "$vulkan_headers_dir:vulkan_headers_config",

build-gn/secondary/build_overrides/vulkan_validation_layers.gni

diff --git a/build-gn/secondary/build_overrides/vulkan_validation_layers.gni b/build-gn/secondary/build_overrides/vulkan_validation_layers.gni
index 66af842..54e94ff 100644
--- a/build-gn/secondary/build_overrides/vulkan_validation_layers.gni
+++ b/build-gn/secondary/build_overrides/vulkan_validation_layers.gni
@@ -14,8 +14,8 @@
 
 # Paths to validation layer dependencies
 vulkan_headers_dir = "//external/Vulkan-Headers"
-spirv_tools_dir = "//external/glslang/External/spirv-tools"
-glslang_dir = "//external/glslang/"
+vvl_spirv_tools_dir = "//external/glslang/External/spirv-tools"
+vvl_glslang_dir = "//external/glslang/"
 
 # Subdirectories for generated files
 vulkan_data_subdir = ""