From d9047e66c7436b9fc50587032ebb03aded29c020 Mon Sep 17 00:00:00 2001 From: Nick Kralevich <nnk@google.com> Date: Tue, 20 Nov 2018 09:35:26 -0800 Subject: [PATCH] Remove obsolete BOARD_SEPOLICY_REPLACE / BOARD_SEPOLICY_IGNORE Commit b4f17069b3514a4b7b3f5c42e879494bbe96bbaf ("sepolicy: Drop BOARD_SEPOLICY_IGNORE/REPLACE support.", Mar 2015) made it a compile time failure to use BOARD_SEPOLICY_REPLACE or BOARD_SEPOLICY_IGNORE. As these restrictions have been in place since 2015, we can safely assume all usages of this have been cleaned up, and there is no further need to check for this. 8 lines deleted from Android.mk, 1720 lines to go. Test: compiles. Change-Id: I23249e4b2e9ec83cb6356a6c5a6e187ae1fc9744 --- Android.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Android.mk b/Android.mk index e1d5f47f9..b701886d8 100644 --- a/Android.mk +++ b/Android.mk @@ -11,14 +11,6 @@ POLICYVERS ?= 30 MLS_SENS=1 MLS_CATS=1024 -ifdef BOARD_SEPOLICY_REPLACE -$(error BOARD_SEPOLICY_REPLACE is no longer supported; please remove from your BoardConfig.mk or other .mk file.) -endif - -ifdef BOARD_SEPOLICY_IGNORE -$(error BOARD_SEPOLICY_IGNORE is no longer supported; please remove from your BoardConfig.mk or other .mk file.) -endif - ifdef BOARD_SEPOLICY_UNION $(warning BOARD_SEPOLICY_UNION is no longer required - all files found in BOARD_SEPOLICY_DIRS are implicitly unioned; please remove from your BoardConfig.mk or other .mk file.) endif -- GitLab