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

Merge "Revert^2 "Add seapp_contexts to allowlist of makefile goal"" am: ac69c239d1 am: 77bd4841a7 am: 76267be6fc

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

Change-Id: Iec3c699a590e06290ad0007d284ea68ff1d0d038
This commit is contained in:
Yuntao Xu
2021-11-20 02:31:23 +00:00
committed by Automerger Merge Worker
parent 0118e502de 76267be6fc
commit e596da3246
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/neverallow.go
View File

@@ -214,8 +214,11 @@ func createMakefileGoalRules() []Rule {
return []Rule{ return []Rule{
NeverAllow(). NeverAllow().
ModuleType("makefile_goal"). 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$")). 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."),
} }
} }

2
android/neverallow_test.go
View File

@@ -293,7 +293,7 @@ var neverallowTests = []struct {
`), `),
}, },
expectedErrors: []string{ 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.",
}, },
}, },
} }