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

Merge "Revert "Add seapp_contexts to allowlist of makefile goal"" am: 030878a492 am: fca78780d4

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

Change-Id: I8e0a9d95b83072ac76b03f61c6ef82510dc26cc8
This commit is contained in:
Vova Sharaienko
2021-11-18 18:32:42 +00:00
committed by Automerger Merge Worker
parent 20cc4f0a1d fca78780d4
commit 547a9f5059
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{ 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 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

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