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 )