commit 62b23335d888afd6fa54e6d149c2fddfeb4634ce
author qinglin.li <qinglin.li@amlogic.com> Sun Jun 25 10:37:41 2023 +0800
committer gerrit autosubmit <gerrit.autosubmit@amlogic.com> Fri Jul 14 03:28:39 2023 -0700
tree da642d7dc5b0138ff099929c33a2936560f8444f
parent 76e52a39bc748fceb748f76cc77d24fb7f379136

bazel: support some build command --upgrade [1/2]

PD#SWPL-127872

Problem:
support some build command --upgrade

Solution:
support some build command --upgrade

Verify:
5.15

Change-Id: Ic5f90990d14b40bc1408c88d12f15b86622261c0
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>

amlogic_utils.sh

diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index 9d334d0..c792310 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -39,19 +39,17 @@
 		fi
 	fi
 
-	if [[ -n ${UPGRADE_PROJECT} ]]; then
-		if [[ ${ANDROID_VERSION} == r || ${ANDROID_VERSION} == R ]]; then
-			KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_UPGRADE_R}
-		fi
-		if [[ ${ANDROID_VERSION} == p || ${ANDROID_VERSION} == P ]]; then
-			KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_UPGRADE_P}
-		fi
-		if [[ ${ANDROID_VERSION} == s || ${ANDROID_VERSION} == S ]]; then
-			KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_UPGRADE_S}
-		fi
-		if [[ ${ANDROID_VERSION} == u || ${ANDROID_VERSION} == U ]]; then
-			KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_UPGRADE_U}
-		fi
+	if [[ ${UPGRADE_PROJECT} == r || ${UPGRADE_PROJECT} == R ]]; then
+		KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_UPGRADE_R}
+	fi
+	if [[ ${UPGRADE_PROJECT} == p || ${UPGRADE_PROJECT} == P ]]; then
+		KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_UPGRADE_P}
+	fi
+	if [[ ${UPGRADE_PROJECT} == s || ${UPGRADE_PROJECT} == S ]]; then
+		KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_UPGRADE_S}
+	fi
+	if [[ ${UPGRADE_PROJECT} == u || ${UPGRADE_PROJECT} == U ]]; then
+		KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_UPGRADE_U}
 	fi
 
 	if [[ ${IN_BUILD_GKI_10} == 1 ]]; then
@@ -1359,8 +1357,9 @@
 			shift
 			;;
 		--upgrade)
-			UPGRADE_PROJECT=1
+			UPGRADE_PROJECT=$2
 			ANDROID_VERSION=$2
+			GKI_CONFIG=
 			VA=1
 			shift
 			;;
@@ -1444,7 +1443,7 @@
 	fi
 
 	if [[ -z ${BAZEL} ]]; then
-		[[ "${FULL_KERNEL_VERSION}" != "common13-5.15" && "${ARCH}" == "arm64" && -z ${UPGRADE_PROJECT} ]] && BAZEL=1
+		[[ "${FULL_KERNEL_VERSION}" != "common13-5.15" && "${ARCH}" == "arm64" ]] && BAZEL=1
 	fi
 
 	auto_patch_to_common_dir