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

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

Change-Id: I3b95c331c3a99edba0c76bd93eab811d3cbde261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

apex/apex.go

@@ -1023,6 +1023,9 @@ func apexStrictUpdatibilityLintMutator(mctx android.TopDownMutatorContext) {
 				// 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 @@ var (
 		"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 {