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

Revert "Add seapp_contexts to allowlist of makefile goal"

Browse Source 
Revert submission 1795972-Convert security/Android.mk to Android.bp

Reason for revert: http://b/206976319 Broken build 7928060 on aosp-master on sdk_arm64-sdk
Reverted Changes:
I0e0e7f677:Split property and file contexts modules
I5596d6f00:Add seapp_contexts to allowlist of makefile goal
If685e5ccc:Convert security/Android.mk to Android.bp

Change-Id: I8cf8c0bc2f88172bb3bfa850bbd7ce6daa170c3d
This commit is contained in:
Vova Sharaienko
2021-11-18 17:29:01 +00:00
parent a92d10bdf2
commit e87a81673e
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

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