modules: different project modules use same configs file [1/2]
PD#SWPL-190807
Problem:
different project modules use same configs file
Solution:
all modules be build and remove it by project file
if module need to be select, should be name by amlogic-soc-*
Verify:
ross
Change-Id: Ic1408b47d1c18a9c2d3ca60526fd837e2a1b2246
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index 2224959..9c7e0e5 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -472,6 +472,8 @@
in_line_i=a
delete_type_modules=()
+ rule_type_modules=
+ select_type_modules=
[[ -z ${TYPE_MODULE_SELECT_MODULE} ]] && TYPE_MODULE_SELECT_MODULE=${TYPE_MODULE_SELECT_MODULE_ANDROID}
echo "TYPE_MODULE_SELECT_MODULE=${TYPE_MODULE_SELECT_MODULE}"
mkdir temp_dir
@@ -498,25 +500,36 @@
if [[ ${select_modules_i} -eq ${select_modules_count} ]]; then
in_line_i=a
echo type_module=$type_module select_modules=$select_modules
- for module in `ls ${type_module}`; do
- dont_delete_module=0
- for select_module in ${select_modules}; do
- if [[ "${select_module}" == "${module}" ]] ; then
- dont_delete_module=1
- break;
- fi
- done
- if [[ ${dont_delete_module} != 1 ]]; then
- echo Delete module: ${module}
- sed -n "/${module}:/p" modules.dep.temp
- sed -i "/${module}:/d" modules.dep.temp
- delete_type_modules=(${delete_type_modules[@]} ${module})
- fi
- done
- echo delete_type_modules=${delete_type_modules[*]}
+ rule_type_modules="${rule_type_modules} ${type_module}"
+ select_type_modules="${select_type_modules} ${select_modules}"
fi
fi
done
+
+ if [[ -n ${ANDROID_PROJECT} ]];then
+ rule_type_modules="${rule_type_modules} ${DEFAULT_DELETE_TYPE_LIST[@]}"
+ rule_type_modules="${rule_type_modules} `echo ${DEFAULT_DELETE_TYPE_LIST_ANDROID}`"
+ fi
+ echo rule_type_modules="${rule_type_modules}"
+ echo select_type_modules="${select_type_modules}"
+
+ for module in `ls ${rule_type_modules}`; do
+ dont_delete_module=0
+ for select_module in ${select_type_modules}; do
+ if [[ "${select_module}" == "${module}" ]] ; then
+ dont_delete_module=1
+ break;
+ fi
+ done
+ if [[ ${dont_delete_module} != 1 ]]; then
+ echo Delete module: ${module}
+ sed -n "/${module}:/p" modules.dep.temp
+ sed -i "/${module}:/d" modules.dep.temp
+ delete_type_modules=(${delete_type_modules[@]} ${module})
+ fi
+ done
+ echo delete_type_modules=${delete_type_modules[*]}
+
if [[ -n ${in_temp_dir} ]]; then
cd ../
rm -r temp_dir