From 1dfe7be90d8d4941c82d54c22f8b326ebed037c7 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Thu, 14 Apr 2022 14:12:12 -0700 Subject: [PATCH] ANDROID: Move BRANCH from build.config.common to .constants. This allows Bazel to load the value of $BRANCH in order to determine the value of --dist_dir of copy_to_dist_dir statically. Test: TH Bug: 229268271 Change-Id: Iff759b8188360ea1b2bc204d29750eece9095582 Signed-off-by: Yifan Hong --- 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 28246dc04628..f9cdc7a7d6c5 100644 --- a/build.config.common +++ b/build.config.common @@ -1,6 +1,5 @@ . ${ROOT_DIR}/${KERNEL_DIR}/build.config.constants -BRANCH=android-mainline KMI_GENERATION=0 LLVM=1 diff --git a/build.config.constants b/build.config.constants index eea6186b0126..d2e42aff59a0 100644 --- a/build.config.constants +++ b/build.config.constants @@ -1 +1,2 @@ +BRANCH=android-mainline CLANG_VERSION=r450784b