From b50d182afc3c9f8c2f79f83938692d45d97ff53d Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Thu, 22 Feb 2024 19:43:37 +0000
Subject: [PATCH] ANDROID: Move BRANCH back to build.config.common.

Revert "ANDROID: Move BRANCH from build.config.common to .constants."

This reverts commit 1dfe7be90d8d4941c82d54c22f8b326ebed037c7.

Reason for revert: BRANCH is no longer used anywhere in .bzl / BUILD
files. For dist_dir, we now use out/<target_name>/dist instead of
out/<branch>/dist.

This is one less item in build.config.constants that requires
kernel_toolchain_ext in bzlmod.

Bug: 276493276
Change-Id: I2efb9144b760c58eeec2eca9f11548943a057324
Signed-off-by: Yifan Hong <elsk@google.com>
---
 build.config.common    | 1 +
 build.config.constants | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.config.common b/build.config.common
index df5a405cc2d4..6e87044b4284 100644
--- a/build.config.common
+++ b/build.config.common
@@ -1,5 +1,6 @@
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.constants
 
+BRANCH=android-mainline
 LLVM=1
 DEPMOD=depmod
 CLANG_PREBUILT_BIN=prebuilts/clang/host/linux-x86/clang-${CLANG_VERSION}/bin
diff --git a/build.config.constants b/build.config.constants
index 892ece1a5b0c..c6ecc8bf01ca 100644
--- a/build.config.constants
+++ b/build.config.constants
@@ -1,4 +1,3 @@
-BRANCH=android-mainline
 CLANG_VERSION=r510928
 AARCH64_NDK_TRIPLE=aarch64-linux-android31
 X86_64_NDK_TRIPLE=x86_64-linux-android31