From a9078747bb152f4a3b1597884762cb4d10526cee Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Wed, 29 Dec 2021 08:59:00 +0000 Subject: [PATCH] Revert^3 "Add seapp_contexts to allowlist of makefile goal" This reverts commit feb0756d41a83f140deb8eb55996009a80004640. Reason for revert: redundant now Change-Id: I6cd43f03a28d03a87d19510a554e3bbe0e69b1de --- android/neverallow.go | 5 +---- android/neverallow_test.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/android/neverallow.go b/android/neverallow.go index b36bf045a..04366d353 100644 --- a/android/neverallow.go +++ b/android/neverallow.go @@ -214,11 +214,8 @@ func createMakefileGoalRules() []Rule { return []Rule{ NeverAllow(). ModuleType("makefile_goal"). - // TODO(b/33691272): remove this after migrating seapp to Soong - Without("product_out_path", "obj/ETC/plat_seapp_contexts_intermediates/plat_seapp_contexts"). - Without("product_out_path", "obj/ETC/plat_seapp_neverallows_intermediates/plat_seapp_neverallows"). WithoutMatcher("product_out_path", Regexp("^boot[0-9a-zA-Z.-]*[.]img$")). - Because("Only boot images and seapp contexts may be imported as a makefile goal."), + Because("Only boot images may be imported as a makefile goal."), } } diff --git a/android/neverallow_test.go b/android/neverallow_test.go index edda2444b..35aadd8b8 100644 --- a/android/neverallow_test.go +++ b/android/neverallow_test.go @@ -293,7 +293,7 @@ var neverallowTests = []struct { `), }, expectedErrors: []string{ - "Only boot images and seapp contexts may be imported as a makefile goal.", + "Only boot images may be imported as a makefile goal.", }, }, }