Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit feb0756d authored Nov 18, 2021 by Yuntao Xu

Revert^2 "Add seapp_contexts to allowlist of makefile goal"

e87a8167

Change-Id: I461f3ecdd0b0ea0a4b7b12531cf8b561e170df55

parent e87a8167

android/neverallow.go

+4 −1

Original line number	Diff line number	Diff line
		@@ -214,8 +214,11 @@ 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 may be imported as a makefile goal."),
		Because("Only boot images and seapp contexts may be imported as a makefile goal."),
		}
		}

android/neverallow_test.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -293,7 +293,7 @@ var neverallowTests = []struct {
		`),
		},
		expectedErrors: []string{
		"Only boot images may be imported as a makefile goal.",
		"Only boot images and seapp contexts may be imported as a makefile goal.",
		},
		},
		}