diff options
| author | 2022-07-01 22:48:49 +0000 | |
|---|---|---|
| committer | 2022-07-01 22:48:49 +0000 | |
| commit | 100c7ad7f28c44ca9110f73b9886c22d00a005d1 (patch) | |
| tree | c65fbfd1022bfec3bfdbd18c818a16f45249763d /java/lint.go | |
| parent | 4b1fe58b7deca2e581b9e2df1a706f687006b4f8 (diff) | |
| parent | e5bf3fb4c2ef475051ef74b29ef732118b8766bf (diff) | |
Merge "Revert^2 "Fix erroneous "Field requires API level 33 (current min is 32)" warnings""
Diffstat (limited to 'java/lint.go')
| -rw-r--r-- | java/lint.go | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/java/lint.go b/java/lint.go index 22c9ec49f..e276345eb 100644 --- a/java/lint.go +++ b/java/lint.go @@ -17,6 +17,7 @@ package java import ( "fmt" "sort" + "strconv" "strings" "github.com/google/blueprint/proptools" @@ -75,9 +76,9 @@ type linter struct { extraLintCheckJars android.Paths test bool library bool - minSdkVersion android.ApiLevel - targetSdkVersion android.ApiLevel - compileSdkVersion android.ApiLevel + minSdkVersion int + targetSdkVersion int + compileSdkVersion int compileSdkKind android.SdkKind javaLanguageLevel string kotlinLanguageLevel string @@ -299,8 +300,8 @@ func (l *linter) generateManifest(ctx android.ModuleContext, rule *android.RuleB Text(`echo "<?xml version='1.0' encoding='utf-8'?>" &&`). 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.String(), l.targetSdkVersion.String()). + Textf(`echo " <uses-sdk android:minSdkVersion='%d' android:targetSdkVersion='%d'/>" &&`, + l.minSdkVersion, l.targetSdkVersion). Text(`echo "</manifest>"`). Text(") >").Output(manifestPath) @@ -325,7 +326,7 @@ func (l *linter) lint(ctx android.ModuleContext) { return } - if l.minSdkVersion.CompareTo(l.compileSdkVersion) == -1 { + if l.minSdkVersion != l.compileSdkVersion { l.extraMainlineLintErrors = append(l.extraMainlineLintErrors, updatabilityChecks...) _, filtered := android.FilterList(l.properties.Lint.Warning_checks, updatabilityChecks) if len(filtered) != 0 { @@ -427,7 +428,7 @@ func (l *linter) lint(ctx android.ModuleContext) { FlagWithOutput("--html ", html). FlagWithOutput("--text ", text). FlagWithOutput("--xml ", xml). - FlagWithArg("--compile-sdk-version ", l.compileSdkVersion.String()). + FlagWithArg("--compile-sdk-version ", strconv.Itoa(l.compileSdkVersion)). FlagWithArg("--java-language-level ", l.javaLanguageLevel). FlagWithArg("--kotlin-language-level ", l.kotlinLanguageLevel). FlagWithArg("--url ", fmt.Sprintf(".=.,%s=out", android.PathForOutput(ctx).String())). |