From 681ba23265bee4f2f0bd461df7d0025f4df17f09 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 8 Mar 2022 19:43:55 +0000 Subject: [PATCH] Revert "ANDROID: fips140: support "evaluation testing" builds via build.sh" This reverts commit b51d71e4aa5f6caecd42f2428869674119b11f74 because this script didn't end up being used. Remove it for now. This script was planned to be used originally; however, in fact making a custom build of fips140.ko alone isn't sufficient to support the testing requirements, some of which were unknown at the time. The current procedure is now to use a device-specific script to build custom boot images; see http://go/fips140-for-android-gki#heading=h.bcuh1mqjhpc4. Bug: 188620248 Change-Id: Ia6e41e3885fad7716d41ab466a656f097f3de2af Signed-off-by: Eric Biggers --- arch/arm64/configs/fips140_gki_eval_testing.fragment | 1 - build.config.gki.aarch64.fips140_eval_testing | 3 --- 2 files changed, 4 deletions(-) delete mode 100644 arch/arm64/configs/fips140_gki_eval_testing.fragment delete mode 100644 build.config.gki.aarch64.fips140_eval_testing diff --git a/arch/arm64/configs/fips140_gki_eval_testing.fragment b/arch/arm64/configs/fips140_gki_eval_testing.fragment deleted file mode 100644 index d8b16022a6dd..000000000000 --- a/arch/arm64/configs/fips140_gki_eval_testing.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_FIPS140_MOD_EVAL_TESTING=y diff --git a/build.config.gki.aarch64.fips140_eval_testing b/build.config.gki.aarch64.fips140_eval_testing deleted file mode 100644 index 66df5fe1bb4f..000000000000 --- a/build.config.gki.aarch64.fips140_eval_testing +++ /dev/null @@ -1,3 +0,0 @@ -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.aarch64.fips140 - -PRE_DEFCONFIG_CMDS+=" cat ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/fips140_gki_eval_testing.fragment >> ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG};"