From a26ac3caee8b9fb39d9645192075bce3eb24c6bd Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Tue, 10 Nov 2020 08:17:59 -0500 Subject: [PATCH] Export Ninja file paths to lunch repo rule from bazel.go This ensures that the lunch repo rule always reads the right Ninja file. Test: USE_BAZEL=1 m Test: m Change-Id: I7f670dd538f46c4dae5ea537b857ff04520b60e7 --- ui/build/bazel.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/build/bazel.go b/ui/build/bazel.go index ca9ad4352..8a9fd14a4 100644 --- a/ui/build/bazel.go +++ b/ui/build/bazel.go @@ -33,6 +33,11 @@ func runBazel(ctx Context, config Config) { outputGroups = strings.Join(config.ninjaArgs, ",") } + config.environ.Set("COMBINED_NINJA", config.CombinedNinjaFile()) + config.environ.Set("KATI_NINJA", config.KatiBuildNinjaFile()) + config.environ.Set("PACKAGE_NINJA", config.KatiPackageNinjaFile()) + config.environ.Set("SOONG_NINJA", config.SoongNinjaFile()) + bazelExecutable := filepath.Join("tools", "bazel") cmd := Command(ctx, config, "bazel", bazelExecutable)