From 2cf278e75bd7bbbd5b064b22bd3f71350953da5b Mon Sep 17 00:00:00 2001
From: Spandan Das <spandandas@google.com>
Date: Thu, 24 Mar 2022 20:19:35 +0000
Subject: [PATCH] Do not propagate strict_updatability linting to conscrypt and
 framework-media java_sdk_libraries

Tmp fix for
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=errorprone&lkgb=8352129&lkbb=8353967&fkbb=8352538

Test: m
out/soong/.intermediates/external/conscrypt/conscrypt.module.public.api.stubs.system/android_common/lint/lint-baseline.xml
Test: (internal CI target) https://android-build.googleplex.com/builds/abtd/run/L67700000953708519
Bug: 182349282
Bug: 226637002
Bug: 226608044

Change-Id: I17e540877200f59bfd51e69e57d8bcca6cf3850f
---
 apex/apex.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/apex/apex.go b/apex/apex.go
index 56313714d..6d8a67a5c 100644
--- a/apex/apex.go
+++ b/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 {