commit 56a1e6a1095567809cfb45f450dfbe104cad5aaf
author Wei-Yin Chen (陳威尹) <wychen@chromium.org> Wed May 24 00:59:19 2017 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 24 20:16:55 2017 +0000
tree 09bacb1e1afc33b6f35893c3e64633a3b1ea8d7c
parent 58a756435ca3700d9766a4580bb0771a9774f603

Reduce absolute paths in generated ninja files in skia

BUG=chromium:723856

Change-Id: Ifa065daddfe1d775e843307587e4007ad6dae6d4
Reviewed-on: https://skia-review.googlesource.com/17802
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

third_party/spirv-tools/BUILD.gn

diff --git a/third_party/spirv-tools/BUILD.gn b/third_party/spirv-tools/BUILD.gn
index 00f2423..4f9304e 100644
--- a/third_party/spirv-tools/BUILD.gn
+++ b/third_party/spirv-tools/BUILD.gn
@@ -13,11 +13,14 @@
     ]
     args = [
       "--spirv-core-grammar=" + rebase_path(
-              "../externals/spirv-headers/include/spirv/$version/spirv.core.grammar.json"),
+              "../externals/spirv-headers/include/spirv/$version/spirv.core.grammar.json",
+              root_build_dir),
       "--core-insts-output=" +
-          rebase_path("$root_out_dir/spirv-tools/core.insts-$version.inc"),
+          rebase_path("$root_out_dir/spirv-tools/core.insts-$version.inc",
+                      root_build_dir),
       "--operand-kinds-output=" +
-          rebase_path("$root_out_dir/spirv-tools/operand.kinds-$version.inc"),
+          rebase_path("$root_out_dir/spirv-tools/operand.kinds-$version.inc",
+                      root_build_dir),
     ]
   }
 }
@@ -40,12 +43,15 @@
   ]
   args = [
     "--spirv-core-grammar=" + rebase_path(
-            "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json"),
+            "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json",
+            root_build_dir),
     "--extinst-glsl-grammar=" +
         rebase_path("../externals/spirv-headers/include/spirv/1.0/" +
-                    "extinst.glsl.std.450.grammar.json"),
+                        "extinst.glsl.std.450.grammar.json",
+                    root_build_dir),
     "--glsl-insts-output=" +
-        rebase_path("$root_out_dir/spirv-tools/glsl.std.450.insts-1.0.inc"),
+        rebase_path("$root_out_dir/spirv-tools/glsl.std.450.insts-1.0.inc",
+                    root_build_dir),
   ]
 }
 
@@ -60,12 +66,15 @@
   ]
   args = [
     "--spirv-core-grammar=" + rebase_path(
-            "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json"),
+            "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json",
+            root_build_dir),
     "--extinst-opencl-grammar=" +
         rebase_path("../externals/spirv-headers/include/spirv/1.0/" +
-                    "extinst.glsl.std.450.grammar.json"),
+                        "extinst.glsl.std.450.grammar.json",
+                    root_build_dir),
     "--opencl-insts-output=" +
-        rebase_path("$root_out_dir/spirv-tools/opencl.std.insts-1.0.inc"),
+        rebase_path("$root_out_dir/spirv-tools/opencl.std.insts-1.0.inc",
+                    root_build_dir),
   ]
 }
 
@@ -78,8 +87,8 @@
     "$root_out_dir/spirv-tools/build.inc",
   ]
   args = [
-    rebase_path("../externals/spirv-tools"),
-    rebase_path("$root_out_dir/spirv-tools/build-version.inc"),
+    rebase_path("../externals/spirv-tools", root_build_dir),
+    rebase_path("$root_out_dir/spirv-tools/build-version.inc", root_build_dir),
   ]
 }
 
@@ -93,9 +102,12 @@
   ]
   args = [
     "--xml=" +
-        rebase_path("../externals/spirv-headers/include/spirv/spir-v.xml"),
+        rebase_path("../externals/spirv-headers/include/spirv/spir-v.xml",
+                    root_build_dir),
     "--generator-output=" +
-        rebase_path("$root_out_dir/spirv-tools/generators.inc"),
+        rebase_path("$root_out_dir/spirv-tools/generators.inc",
+                    root_build_dir,
+                    root_build_dir),
   ]
 }