From c94696afdd69e12498cc026d7b47178cd0c68721 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Tue, 22 Nov 2022 11:07:27 +0000 Subject: [PATCH] BUILD.gn: Make toolchain.ninja not contain system absolute paths. Fixed: chromium:1382452 Change-Id: Ib21745a0c7a171c0a6718a5b3bf431bbf273ae3f Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/111001 Auto-Submit: Corentin Wallez Kokoro: Kokoro Commit-Queue: Corentin Wallez Reviewed-by: Ben Clayton --- generator/dawn_generator.gni | 5 +++-- generator/generator_lib.gni | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/generator/dawn_generator.gni b/generator/dawn_generator.gni index 91e4cf70f2..9b6183f504 100644 --- a/generator/dawn_generator.gni +++ b/generator/dawn_generator.gni @@ -41,10 +41,11 @@ import("generator_lib.gni") # template("dawn_generator") { generator_lib_action(target_name) { - forward_variables_from(invoker, "*") + forward_variables_from(invoker, "*", [ "script" ]) + script = get_path_info(invoker.script, "abspath") # Set arguments required to find the python libraries for the generator - generator_lib_dir = "${dawn_root}/generator" + generator_lib_dir = get_path_info("${dawn_root}/generator", "abspath") jinja2_path = dawn_jinja2_dir # Force Dawn's autogenerated file structure to mirror exactly the source diff --git a/generator/generator_lib.gni b/generator/generator_lib.gni index b7a5c1c45b..c438f5b948 100644 --- a/generator/generator_lib.gni +++ b/generator/generator_lib.gni @@ -57,7 +57,7 @@ template("generator_lib_action") { } _generator_args += [ "--template-dir", - rebase_path(_template_dir), + rebase_path(_template_dir, root_build_dir), ] if (defined(invoker.root_dir)) { @@ -70,7 +70,7 @@ template("generator_lib_action") { if (defined(invoker.jinja2_path)) { _generator_args += [ "--jinja2-path", - rebase_path(invoker.jinja2_path), + rebase_path(invoker.jinja2_path, root_build_dir), ] }