Translate SDK level 10000 to a valid compiler min-api

Targets with the special level 10000 are compiled using the current
platform SDK level. They are also compiled as a "platform build" which
will disable features such as API modeling and method backports.

Bug: 295591477
Test: manual inspection of the updated build commands
Change-Id: Ifda8859396b33dde4c46a9b212ddb855b012bf07
This commit is contained in:
Ian Zerny
2023-08-25 13:43:44 +02:00
parent b84435c0ab
commit c26029b473

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.,
// services.jar), are not classified as stable, which is WAI.
// TODO(b/232073181): Expand to additional min SDK cases after validation.
var addAndroidPlatformBuildFlag = false
if !dexParams.sdkVersion.Stable() {
flags = append(flags, "--android-platform-build")
addAndroidPlatformBuildFlag = true
}
effectiveVersion, err := dexParams.minSdkVersion.EffectiveVersion(ctx)
@@ -226,7 +227,18 @@ func (d *dexer) dexCommonFlags(ctx android.ModuleContext,
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
}