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

Commit da7b22ff authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

Enforce newapi check only if min_sdk_version < compile_sdk_version am: a3264efb am: f4875cf3 

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



Change-Id: Ia0b5a20e8ab32bcc003b020d1f2272c3279d45f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fad3d9bc f4875cf3

java/base.go

+6 −6
Original line number Diff line number Diff line
@@ -1481,11 +1481,11 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 
	}



	if ctx.Device() {

		lintSDKVersionString := func(sdkSpec android.SdkSpec) string {

		lintSDKVersion := func(sdkSpec android.SdkSpec) android.ApiLevel {

			if v := sdkSpec.ApiLevel; !v.IsPreview() {

				return v.String()

				return v

			} else {

				return ctx.Config().DefaultAppTargetSdk(ctx).String()

				return ctx.Config().DefaultAppTargetSdk(ctx)

			}

		}
@@ -1494,9 +1494,9 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 
		j.linter.srcJars = srcJars

		j.linter.classpath = append(append(android.Paths(nil), flags.bootClasspath...), flags.classpath...)

		j.linter.classes = j.implementationJarFile

		j.linter.minSdkVersion = lintSDKVersionString(j.MinSdkVersion(ctx))

		j.linter.targetSdkVersion = lintSDKVersionString(j.TargetSdkVersion(ctx))

		j.linter.compileSdkVersion = lintSDKVersionString(j.SdkVersion(ctx))

		j.linter.minSdkVersion = lintSDKVersion(j.MinSdkVersion(ctx))

		j.linter.targetSdkVersion = lintSDKVersion(j.TargetSdkVersion(ctx))

		j.linter.compileSdkVersion = lintSDKVersion(j.SdkVersion(ctx))

		j.linter.compileSdkKind = j.SdkVersion(ctx).Kind

		j.linter.javaLanguageLevel = flags.javaVersion.String()

		j.linter.kotlinLanguageLevel = "1.3"

java/lint.go

+6 −6
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ type linter struct { 
	extraLintCheckJars      android.Paths

	test                    bool

	library                 bool

	minSdkVersion           string

	targetSdkVersion        string

	compileSdkVersion       string

	minSdkVersion           android.ApiLevel

	targetSdkVersion        android.ApiLevel

	compileSdkVersion       android.ApiLevel

	compileSdkKind          android.SdkKind

	javaLanguageLevel       string

	kotlinLanguageLevel     string
@@ -300,7 +300,7 @@ func (l *linter) generateManifest(ctx android.ModuleContext, rule *android.RuleB 
		Text(`echo "<manifest xmlns:android='http://schemas.android.com/apk/res/android'" &&`).

		Text(`echo "    android:versionCode='1' android:versionName='1' >" &&`).

		Textf(`echo "  <uses-sdk android:minSdkVersion='%s' android:targetSdkVersion='%s'/>" &&`,

			l.minSdkVersion, l.targetSdkVersion).

			l.minSdkVersion.String(), l.targetSdkVersion.String()).

		Text(`echo "</manifest>"`).

		Text(") >").Output(manifestPath)
@@ -325,7 +325,7 @@ func (l *linter) lint(ctx android.ModuleContext) { 
		return

	}



	if l.minSdkVersion != l.compileSdkVersion {

	if l.minSdkVersion.CompareTo(l.compileSdkVersion) == -1 {

		l.extraMainlineLintErrors = append(l.extraMainlineLintErrors, updatabilityChecks...)

		_, filtered := android.FilterList(l.properties.Lint.Warning_checks, updatabilityChecks)

		if len(filtered) != 0 {
@@ -427,7 +427,7 @@ func (l *linter) lint(ctx android.ModuleContext) { 
		FlagWithOutput("--html ", html).

		FlagWithOutput("--text ", text).

		FlagWithOutput("--xml ", xml).

		FlagWithArg("--compile-sdk-version ", l.compileSdkVersion).

		FlagWithArg("--compile-sdk-version ", l.compileSdkVersion.String()).

		FlagWithArg("--java-language-level ", l.javaLanguageLevel).

		FlagWithArg("--kotlin-language-level ", l.kotlinLanguageLevel).

		FlagWithArg("--url ", fmt.Sprintf(".=.,%s=out", android.PathForOutput(ctx).String())).