Merge "Do not propagate strict_updatability linting to conscrypt and framework-media java_sdk_libraries" am: 183ed1044c
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>
diff --git a/apex/apex.go b/apex/apex.go
index 5631371..6d8a67a 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1023,6 +1023,9 @@
// Do not traverse transitive deps of libcore/ libs
return false
}
+ if android.InList(child.Name(), skipLintJavalibAllowlist) {
+ return false
+ }
if lintable, ok := child.(java.LintDepSetsIntf); ok {
lintable.SetStrictUpdatabilityLinting(true)
}
@@ -1047,6 +1050,17 @@
"test_com.android.media",
"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 {