StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert^3 "Add seapp_contexts to allowlist of makefile goal"" am: 865d5e6c9d am: c24e740cd0 am: 865498319d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934941

Change-Id: I6eb14ca05494ff8c972068615dfc35dc4e3a303f
This commit is contained in:
Inseob Kim
2022-01-10 12:12:37 +00:00
committed by Automerger Merge Worker
parent 19d8dd9085 865498319d
commit 51c8d94d37
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/neverallow.go
View File

@@ -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."),
}
}

2
android/neverallow_test.go
View File

@@ -324,7 +324,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.",
},
},
{