From c7ca96987092256bfaa43ceb0946052c06a0b87e Mon Sep 17 00:00:00 2001
From: Matthias Maennich <maennich@google.com>
Date: Wed, 14 Jul 2021 17:41:56 +0100
Subject: [PATCH] ANDROID: Kleaf: adopt new way of expressing the build config

Build config files can now be expressed as files relative to the
BUILD.bazel file. That makes this mechanism much more portable.

Bug: 192656402
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Iefa7277f21e9412e71c9738664d006246b05be6e
---
 BUILD.bazel | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index 4c1a6b6a3e28..9ef548ced327 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -31,8 +31,6 @@ x86_64_outs = common_outs + ["bzImage"]
 
 [kernel_build(
     name = name,
-    outs = outs,
-    build_config = config,
     srcs = glob(
         ["**"],
         exclude = [
@@ -41,25 +39,27 @@ x86_64_outs = common_outs + ["bzImage"]
             "**/*.bzl",
         ],
     ),
+    outs = outs,
+    build_config = config,
 ) for name, config, outs in [
     (
         "kernel_aarch64",
-        "common/build.config.gki.aarch64",
+        "build.config.gki.aarch64",
         aarch64_outs,
     ),
     (
         "kernel_aarch64_debug",
-        "common/build.config.gki-debug.aarch64",
+        "build.config.gki-debug.aarch64",
         aarch64_outs,
     ),
     (
         "kernel_x86_64",
-        "common/build.config.gki.x86_64",
+        "build.config.gki.x86_64",
         x86_64_outs,
     ),
     (
         "kernel_x86_64_debug",
-        "common/build.config.gki-debug.x86_64",
+        "build.config.gki-debug.x86_64",
         x86_64_outs,
     ),
 ]]