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

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

Browse Source 
exclude_static_lib property was introduced to enable static lib
switching based on build configuration. The usage of property was
limited to build/soong directory to prevent other modules from using the
proerty.

In order to allow "core-lambda-stubs" and
"android-non-updatable.stubs.*" to utilize similar static lib switching
based on build configuration, allow exclude_static_libs property to be
used in libcore and frameworks/base/api directory.

Test: m nothing
Bug: 287344503
Change-Id: I342b09c7ada03607b12dc8896ae39825d8545e92
This commit is contained in:
Jihoon Kang
2023-06-14 23:14:42 +00:00
parent 1147b31eb0
commit 3d4d88d68e
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

@@ -256,10 +256,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`,
}, },
}, },
} }