From dc2eba997bebc27b780ddbf40656451739969e05 Mon Sep 17 00:00:00 2001
From: Ulises Mendez Martinez <umendez@google.com>
Date: Tue, 25 Mar 2025 16:40:36 +0000
Subject: [PATCH] ANDROID: Relocate non-GKI defconfig fragments

... out of gki/ directory.

Bug: 368119551
Bug: 404598434
Change-Id: Ib0708cfcd1cb530f0ffd7c9bde6e00c99a1198de
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
---
 BUILD.bazel                                                 | 6 +++---
 .../allmodconfig => arch/arm/configs/allmodconfig.fragment  | 0
 .../arm64/configs/allmodconfig.fragment                     | 0
 .../allmodconfig => arch/x86/configs/allmodconfig.fragment  | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename gki/arm/defconfig/allmodconfig => arch/arm/configs/allmodconfig.fragment (100%)
 rename gki/aarch64/defconfig/allmodconfig => arch/arm64/configs/allmodconfig.fragment (100%)
 rename gki/x86_64/defconfig/allmodconfig => arch/x86/configs/allmodconfig.fragment (100%)

diff --git a/BUILD.bazel b/BUILD.bazel
index b6b3ee196ed4..34d4b31f5854 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1421,7 +1421,7 @@ kernel_build(
         "modules",
     ],
     makefile = ":Makefile",
-    post_defconfig_fragments = [":gki/aarch64/defconfig/allmodconfig"],
+    post_defconfig_fragments = ["arch/arm64/configs/allmodconfig.fragment"],
     visibility = ["//visibility:private"],
 )
 
@@ -1439,7 +1439,7 @@ kernel_build(
         "modules",
     ],
     makefile = ":Makefile",
-    post_defconfig_fragments = [":gki/x86_64/defconfig/allmodconfig"],
+    post_defconfig_fragments = ["arch/x86/configs/allmodconfig.fragment"],
     visibility = ["//visibility:private"],
 )
 
@@ -1467,7 +1467,7 @@ kernel_build(
         "modules",
     ],
     makefile = ":Makefile",
-    post_defconfig_fragments = [":gki/arm/defconfig/allmodconfig"],
+    post_defconfig_fragments = ["arch/arm/configs/allmodconfig.fragment"],
     visibility = ["//visibility:private"],
 )
 
diff --git a/gki/arm/defconfig/allmodconfig b/arch/arm/configs/allmodconfig.fragment
similarity index 100%
rename from gki/arm/defconfig/allmodconfig
rename to arch/arm/configs/allmodconfig.fragment
diff --git a/gki/aarch64/defconfig/allmodconfig b/arch/arm64/configs/allmodconfig.fragment
similarity index 100%
rename from gki/aarch64/defconfig/allmodconfig
rename to arch/arm64/configs/allmodconfig.fragment
diff --git a/gki/x86_64/defconfig/allmodconfig b/arch/x86/configs/allmodconfig.fragment
similarity index 100%
rename from gki/x86_64/defconfig/allmodconfig
rename to arch/x86/configs/allmodconfig.fragment