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

Merge "Allow java_library.exclude_static_libs property for libcore and f/b/api"

Browse Source
This commit is contained in:
Jihoon Kang
2023-06-23 17:10:54 +00:00
committed by Gerrit Code Review
parent 184893a851 3d4d88d68e
commit 019ffe121c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/neverallow.go
View File

@@ -258,10 +258,10 @@ func createProhibitFrameworkAccessRules() []Rule {
func createJavaExcludeStaticLibsRule() Rule { func createJavaExcludeStaticLibsRule() Rule {
return NeverAllow(). return NeverAllow().
NotIn("build/soong"). NotIn("build/soong", "libcore", "frameworks/base/api").
ModuleType("java_library"). ModuleType("java_library").
WithMatcher("exclude_static_libs", isSetMatcherInstance). WithMatcher("exclude_static_libs", isSetMatcherInstance).
Because("exclude_static_libs property is only allowed for java modules defined in build/soong") Because("exclude_static_libs property is only allowed for java modules defined in build/soong, libcore, and frameworks/base/api")
} }
func neverallowMutator(ctx BottomUpMutatorContext) { func neverallowMutator(ctx BottomUpMutatorContext) {

2
android/neverallow_test.go
View File

@@ -358,7 +358,7 @@ var neverallowTests = []struct {
`), `),
}, },
expectedErrors: []string{ expectedErrors: []string{
`exclude_static_libs property is only allowed for java modules defined in build/soong`, `exclude_static_libs property is only allowed for java modules defined in build/soong, libcore, and frameworks/base/api`,
}, },
}, },
} }