Script: add a new config for customer to configure android project [1/1]
PD#SWPL-123455
Problem:
customer wants to add a new config used by themself
Solution:
add a option to add new config for android project
Verify:
local
Change-Id: I2dbf851c4324e3e43e51f87a40132362ac5c3fda
Signed-off-by: Dezhen Wang <dezhen.wang@amlogic.com>
diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index bae3e8e..aa8fc11 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -39,27 +39,29 @@
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}
fi
- if [[ -n ${DEV_CONFIG} ]]; then
- config_list=$(echo ${CONFIG_GROUP}|sed 's/+/ /g')
- #verify the extra config is in the right path and merge the config
- CONFIG_DIR=arch/${ARCH}/configs
- for config_name in ${config_list[@]}
- do
- if [[ ! -f ${ROOT_DIR}/${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/${CONFIG_DIR}/${config_name} ]]; then
- echo "ERROR: config file ${config_name} is not in the right path!!"
- exit
- else
- KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/${CONFIG_DIR}/${config_name}
- fi
- done
- fi
-
if [[ ${IN_BUILD_GKI_10} == 1 ]]; then
local temp_file=`mktemp /tmp/config.XXXXXXXXXXXX`
echo "CONFIG_MODULE_SIG_ALL=y" >> ${temp_file}
KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${temp_file}
rm ${temp_file}
fi
+
+ if [[ -n ${DEV_CONFIGS} ]]; then
+ config_list=$(echo ${DEV_CONFIGS}|sed 's/+/ /g')
+ #verify the extra config is in the right path and merge the config
+ CONFIG_DIR=arch/${ARCH}/configs
+ for config_name in ${config_list[@]}
+ do
+ if [[ -f ${ROOT_DIR}/${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/${CONFIG_DIR}/${config_name} ]]; then
+ KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/${CONFIG_DIR}/${config_name}
+ elif [[ -f ${config_name} ]]; then
+ KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${config_name}
+ else
+ echo "ERROR: config file ${config_name} is not in the right path!!"
+ exit
+ fi
+ done
+ fi
}
export -f pre_defconfig_cmds
@@ -1160,7 +1162,7 @@
function export_env_variable () {
export ABI BUILD_CONFIG LTO KMI_SYMBOL_LIST_STRICT_MODE CHECK_DEFCONFIG MANUAL_INSMOD_MODULE ARCH
- export KERNEL_DIR COMMON_DRIVERS_DIR BUILD_DIR ANDROID_PROJECT GKI_CONFIG UPGRADE_PROJECT FAST_BUILD CHECK_GKI_20 DEV_CONFIG CONFIG_GROUP
+ export KERNEL_DIR COMMON_DRIVERS_DIR BUILD_DIR ANDROID_PROJECT GKI_CONFIG UPGRADE_PROJECT FAST_BUILD CHECK_GKI_20 DEV_CONFIGS
export FULL_KERNEL_VERSION BAZEL
echo ROOT_DIR=$ROOT_DIR