commit 2613cb5e3a21177b00fdbbb43f8eb267ddd86696
author Jamie Madill <jmadill@chromium.org> Wed Nov 27 08:34:49 2019 -0500
committer Jamie Madill <jmadill@chromium.org> Wed Nov 27 16:44:24 2019 +0000
tree 738e0f9ce511040182f1c24cee0b732d9d8507e3
parent ac3a67cf2fe455391b89177b988c7aba239851df

Fix ICD build when using multiple toolchains.

We should be using root_out_dir, not root_build_dir. This was causing
issues with NaCL. GN descriptions:

root_out_dir: [string] Root directory for toolchain output files.
root_build_dir: [string] Directory where build commands are run.

Bug: dawn:283
Change-Id: I0730b96d303151b715672d6937031e557e1994f0
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/38748
Reviewed-by: Corentin Wallez <cwallez@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/Vulkan/BUILD.gn

diff --git a/src/Vulkan/BUILD.gn b/src/Vulkan/BUILD.gn
index 701ed4d..cb804b4 100644
--- a/src/Vulkan/BUILD.gn
+++ b/src/Vulkan/BUILD.gn
@@ -189,7 +189,7 @@
 # Generates an ICD JSON file that can be used by all targets in this GN build
 # (ANGLE, Dawn, Chromium).
 action("icd_file") {
-  output_icd_file = "${root_build_dir}/${swiftshader_icd_file_name}"
+  output_icd_file = "${root_out_dir}/${swiftshader_icd_file_name}"
   input_file = swiftshader_icd_file_name
 
   if (is_win) {
@@ -203,9 +203,9 @@
   script = "write_icd_json.py"
   args = [
     "--input",
-    rebase_path(input_file, root_build_dir),
+    rebase_path(input_file, root_out_dir),
     "--output",
-    rebase_path(output_icd_file, root_build_dir),
+    rebase_path(output_icd_file, root_out_dir),
     "--library_path",
     library_path,
   ]