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

Merge "Do not propagate strict_updatability linting to conscrypt and framework-media java_sdk_libraries" am: 183ed1044c

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

Change-Id: Ice945ab22199b5b552a9a68f31b8eea9c4d879d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das
2022-03-25 17:02:53 +00:00
committed by Automerger Merge Worker
parent 2705a090ca 183ed1044c
commit d2f5f1c690
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apex/apex.go
View File

@@ -1023,6 +1023,9 @@ func apexStrictUpdatibilityLintMutator(mctx android.TopDownMutatorContext) {
// Do not traverse transitive deps of libcore/ libs // Do not traverse transitive deps of libcore/ libs
return false return false
} }
if android.InList(child.Name(), skipLintJavalibAllowlist) {
return false
}
if lintable, ok := child.(java.LintDepSetsIntf); ok { if lintable, ok := child.(java.LintDepSetsIntf); ok {
lintable.SetStrictUpdatabilityLinting(true) lintable.SetStrictUpdatabilityLinting(true)
} }
@@ -1047,6 +1050,17 @@ var (
"test_com.android.media", "test_com.android.media",
"test_jitzygote_com.android.art", "test_jitzygote_com.android.art",
} }
// TODO: b/215736885 Remove this list
skipLintJavalibAllowlist = []string{
"conscrypt.module.platform.api.stubs",
"conscrypt.module.public.api.stubs",
"conscrypt.module.public.api.stubs.system",
"conscrypt.module.public.api.stubs.module_lib",
"framework-media.stubs",
"framework-media.stubs.system",
"framework-media.stubs.module_lib",
}
) )
func (a *apexBundle) checkStrictUpdatabilityLinting() bool { func (a *apexBundle) checkStrictUpdatabilityLinting() bool {