StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Translate SDK level 10000 to a valid compiler min-api" into main

Browse Source
This commit is contained in:
Ian Zerny
2023-08-28 06:26:36 +00:00
committed by Gerrit Code Review
parent 54a5905803 c26029b473
commit f94c8113a3
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/dex.go
View File

@@ -217,8 +217,9 @@ func (d *dexer) dexCommonFlags(ctx android.ModuleContext,
// Note: Targets with a min SDK kind of core_platform (e.g., framework.jar) or unspecified (e.g., // Note: Targets with a min SDK kind of core_platform (e.g., framework.jar) or unspecified (e.g.,
// services.jar), are not classified as stable, which is WAI. // services.jar), are not classified as stable, which is WAI.
// TODO(b/232073181): Expand to additional min SDK cases after validation. // TODO(b/232073181): Expand to additional min SDK cases after validation.
var addAndroidPlatformBuildFlag = false
if !dexParams.sdkVersion.Stable() { if !dexParams.sdkVersion.Stable() {
flags = append(flags, "--android-platform-build") addAndroidPlatformBuildFlag = true
} }
effectiveVersion, err := dexParams.minSdkVersion.EffectiveVersion(ctx) effectiveVersion, err := dexParams.minSdkVersion.EffectiveVersion(ctx)
@@ -226,7 +227,18 @@ func (d *dexer) dexCommonFlags(ctx android.ModuleContext,
ctx.PropertyErrorf("min_sdk_version", "%s", err) ctx.PropertyErrorf("min_sdk_version", "%s", err)
} }
flags = append(flags, "--min-api "+strconv.Itoa(effectiveVersion.FinalOrFutureInt())) // If the specified SDK level is 10000, then configure the compiler to use the
// current platform SDK level and to compile the build as a platform build.
var minApiFlagValue = effectiveVersion.FinalOrFutureInt()
if minApiFlagValue == 10000 {
minApiFlagValue = ctx.Config().PlatformSdkVersion().FinalInt()
addAndroidPlatformBuildFlag = true
}
flags = append(flags, "--min-api "+strconv.Itoa(minApiFlagValue))
if addAndroidPlatformBuildFlag {
flags = append(flags, "--android-platform-build")
}
return flags, deps return flags, deps
} }