commit 389749ae554d9dda069e1baef703a518c57bb1ea
author Jamie Madill <jmadill@chromium.org> Thu Nov 28 10:35:58 2019 -0500
committer Jamie Madill <jmadill@chromium.org> Thu Nov 28 17:03:03 2019 +0000
tree 7bfeea2094d02c08224f3fbb73958e9707eca0a4
parent 4cea2aef55dcfc34b3921d9b625f71f53fb4572d

Fix ICD generation (again).

The correct usage is to use root_out_dir in the output file name
and to use root_build_dir in the rebased arguments.

Fixes the 32-bit NACL build on Windows. (Tested locally)

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

src/Vulkan/BUILD.gn

diff --git a/src/Vulkan/BUILD.gn b/src/Vulkan/BUILD.gn
index cb804b4..613c1fb 100644
--- a/src/Vulkan/BUILD.gn
+++ b/src/Vulkan/BUILD.gn
@@ -203,9 +203,9 @@
   script = "write_icd_json.py"
   args = [
     "--input",
-    rebase_path(input_file, root_out_dir),
+    rebase_path(input_file, root_build_dir),
     "--output",
-    rebase_path(output_icd_file, root_out_dir),
+    rebase_path(output_icd_file, root_build_dir),
     "--library_path",
     library_path,
   ]