Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf47a886 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scripts: gki: Disable DEBUG_FS for user variant builds"

parents e140d708 20bbd468

scripts/gki/envsetup.sh

+7 −0
Original line number Diff line number Diff line
@@ -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`

scripts/gki/fragment_menuconfig.sh

+3 −0
Original line number Diff line number Diff line
@@ -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 "

scripts/gki/generate_defconfig.sh

+3 −0
Original line number Diff line number Diff line
@@ -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 "