From 0270bff881d4013a17fb9cb8939d7cbf0c979818 Mon Sep 17 00:00:00 2001 From: Alexander Potapenko Date: Fri, 30 Apr 2021 11:33:53 +0200 Subject: [PATCH] Revert "ANDROID: GKI: Enable CONFIG_KUNIT" This reverts commit 6d961aa91d468af8b41cbd7615a5fbbe0f69f516. Currently there are no tests depending on it, so let us reduce the API surface. Bug: 176228452 Bug: 186450428 Test: Treehugger Signed-off-by: Alexander Potapenko Change-Id: I14d163f9b0fcc2d34984abdad424d49c8054a65f --- arch/arm64/configs/gki_defconfig | 2 -- arch/x86/configs/gki_defconfig | 2 -- 2 files changed, 4 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 2bb566fbd36a..3fa3b8678da4 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -663,6 +663,4 @@ CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_TRACE_MMIO_ACCESS=y CONFIG_TRACEFS_DISABLE_AUTOMOUNT=y CONFIG_HIST_TRIGGERS=y -CONFIG_KUNIT=y -CONFIG_KUNIT_DEBUGFS=y # CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index b5438ac041f7..1de695c2aa4d 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -596,5 +596,3 @@ CONFIG_SCHEDSTATS=y CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_TRACEFS_DISABLE_AUTOMOUNT=y CONFIG_UNWINDER_FRAME_POINTER=y -CONFIG_KUNIT=y -CONFIG_KUNIT_DEBUGFS=y