scripts: gki: Disable DEBUG_FS for user variant builds

DEBUG_FS is enabled in {target}-gki_defconfig for supporting
internal test teams requirements. But android requirement is
that, DEBUG_FS should be disabled for user builds. So add
support to merge debugfs.config fragment for user builds.

Change-Id: I584db74375ce968fd2eacbe03548f07f73416152
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
This commit is contained in:
Prasad Sodagudi 2020-06-17 08:04:51 -07:00
parent c322899f4a
commit 20bbd46847
3 changed files with 13 additions and 0 deletions

View File

@ -27,6 +27,13 @@ QCOM_GKI_FRAG=${CONFIGS_DIR}/${PLATFORM_NAME}_GKI.config
QCOM_QGKI_FRAG=${CONFIGS_DIR}/${PLATFORM_NAME}_QGKI.config
QCOM_DEBUG_FRAG=${CONFIGS_DIR}/${PLATFORM_NAME}_debug.config
# For user variant build merge debugfs.config fragment.
if [ ${TARGET_BUILD_VARIANT} == "user" ]; then
QCOM_DEBUG_FS_FRAG=`ls ${CONFIGS_DIR}/debugfs.config 2> /dev/null`
else
QCOM_DEBUG_FS_FRAG=" "
fi
# Consolidate fragment may not be present for all platforms.
QCOM_CONSOLIDATE_FRAG=`ls ${CONFIGS_DIR}/${PLATFORM_NAME}_consolidate.config 2> /dev/null`

View File

@ -64,6 +64,9 @@ case "$REQUIRED_DEFCONFIG" in
FINAL_DEFCONFIG_BLEND+=" $QCOM_CONSOLIDATE_FRAG"
;& # Intentional fallthrough
${PLATFORM_NAME}-qgki_defconfig )
# DEBUG_FS fragment.
FINAL_DEFCONFIG_BLEND+=" $QCOM_DEBUG_FS_FRAG"
FINAL_DEFCONFIG_BLEND+=" $QCOM_QGKI_FRAG"
${SCRIPTS_ROOT}/fragment_allyesconfig.sh $QCOM_GKI_FRAG $QCOM_GKI_ALLYES_FRAG
FINAL_DEFCONFIG_BLEND+=" $QCOM_GKI_ALLYES_FRAG "

View File

@ -63,6 +63,9 @@ case "$REQUIRED_DEFCONFIG" in
FINAL_DEFCONFIG_BLEND+=" $QCOM_CONSOLIDATE_FRAG"
;& # Intentional fallthrough
${PLATFORM_NAME}-qgki_defconfig )
# DEBUG_FS fragment.
FINAL_DEFCONFIG_BLEND+=" $QCOM_DEBUG_FS_FRAG"
FINAL_DEFCONFIG_BLEND+=" $QCOM_QGKI_FRAG"
${SCRIPTS_ROOT}/fragment_allyesconfig.sh $QCOM_GKI_FRAG $QCOM_GKI_ALLYES_FRAG
FINAL_DEFCONFIG_BLEND+=" $QCOM_GKI_ALLYES_FRAG "