Merge SP1A.210513.004

Change-Id: I665e5cfaed34c1d454e6603b8eac1e0f6d4102a0

1 files changed, 14 insertions, 0 deletions

diff --git a/java/java.go b/java/java.go
index d74bf6825..9a5fbfc35 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1222,6 +1222,13 @@ func (j *Import) LintDepSets() LintDepSets {
 	return LintDepSets{}
 }
 
+func (j *Import) getStrictUpdatabilityLinting() bool {
+	return false
+}
+
+func (j *Import) setStrictUpdatabilityLinting(bool) {
+}
+
 func (j *Import) DepsMutator(ctx android.BottomUpMutatorContext) {
 	ctx.AddVariationDependencies(nil, libTag, j.properties.Libs...)
 
@@ -1545,6 +1552,13 @@ func (j *DexImport) IsInstallable() bool {
 	return true
 }
 
+func (j *DexImport) getStrictUpdatabilityLinting() bool {
+	return false
+}
+
+func (j *DexImport) setStrictUpdatabilityLinting(bool) {
+}
+
 func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 	if len(j.properties.Jars) != 1 {
 		ctx.PropertyErrorf("jars", "exactly one jar must be provided")