From cc69f6bdcb088d3ff4dbbae938f2862f80dcabd4 Mon Sep 17 00:00:00 2001 From: zhaoxp3 Date: Thu, 17 Sep 2020 17:22:37 +0800 Subject: [PATCH] arm64/defconfig: disable debug fs on user build cherry-pick from: (CR): arm64/defconfig: disable debug fs on user build according to android R, disable debug fs for user build Change-Id: I985888644c92e14205f7260c423bb88bad026dd9 Signed-off-by: zhaoxp3 Reviewed-on: https://gerrit.mot.com/1752415 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wang Wang Submit-Approved: Jira Key Reviewed-on: https://gerrit.mot.com/1753930 Reviewed-by: Jianguo Liu --- defconfig.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/defconfig.mk b/defconfig.mk index 45c9246eca30..f85e9c73586f 100644 --- a/defconfig.mk +++ b/defconfig.mk @@ -7,6 +7,7 @@ KERNEL_DEBUG_DEFCONFIG := $(LJAPDEFCONFIGSRC)/debug-$(DEFCONFIG_BASENAM KERNEL_DEBUG_ARCH_DEFCONFIG := $(LJAPDEFCONFIGSRC)/debug-$(DEFCONFIG_BASENAME)-$(KERNEL_ARCH).config PRODUCT_KERNEL_DEBUG_DEFCONFIG := $(LJAPDEFCONFIGSRC)/$(PRODUCT_DEBUG_DEFCONFIG) FACTORY_DEFCONFIG := $(LJAPDEFCONFIGSRC)/factory-$(DEFCONFIG_BASENAME).config +KERNEL_DEBUG_FS_DEFCONFIG := ${DEFCONFIGSRC}/vendor/debugfs.config # add debug config file for non-user build ifneq ($(TARGET_BUILD_VARIANT), user) @@ -37,6 +38,14 @@ ifneq ($(KERNEL_EXTRA_CONFIG),) PRODUCT_SPECIFIC_DEFCONFIGS += $(KERNEL_EXTRA_CONFIG:%=$(LJAPDEFCONFIGSRC)/%.config) endif +ifeq ($(TARGET_BUILD_VARIANT), user) +ifeq (true,$(call math_gt_or_eq,$(SHIPPING_API_LEVEL),30)) +# disable debug fs +PRODUCT_SPECIFIC_DEFCONFIGS += $(KERNEL_DEBUG_FS_DEFCONFIG) +endif +endif + + define do-make-defconfig $(hide) mkdir -p $(dir $(1)) ( perl -le 'print "# This file was automatically generated from:\n#\t" . join("\n#\t", @ARGV) . "\n"' $(2) && cat $(2) ) > $(1) || ( rm -f $(1) && false )