Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 183ed104 authored by Spandan Das's avatar Spandan Das Committed by Gerrit Code Review
Browse files

Merge "Do not propagate strict_updatability linting to conscrypt and... 

Merge "Do not propagate strict_updatability linting to conscrypt and framework-media java_sdk_libraries"
parents dadc037e 2cf278e7

apex/apex.go

+14 −0
Original line number Diff line number Diff line
@@ -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 {