target_sdk_version replacement should respect REL branches
Currently, target_sdk_version of MTS tests were being set to 10000 even in release branches. This should only happen in active branches. Test: Unit test Test: aapt2 on CtsContentTestCases in udc-dev and verified targetSdkVersion is 34 Bug: 279507428 Change-Id: Ib79318febc0f6e771b3679c0281a97357930ec56
This commit is contained in:
@@ -63,9 +63,11 @@ func targetSdkVersionForManifestFixer(ctx android.ModuleContext, params Manifest
|
||||
// 2. The module is run as part of MTS, and should be testable on stable branches
|
||||
// Do not return 10000 if we are enforcing default targetSdkVersion and sdk has been finalised
|
||||
func shouldReturnFinalOrFutureInt(ctx android.ModuleContext, targetSdkVersionLevel android.ApiLevel, enforceDefaultTargetSdkVersion bool) bool {
|
||||
if enforceDefaultTargetSdkVersion && ctx.Config().PlatformSdkFinal() {
|
||||
// If this is a REL branch, do not return 10000
|
||||
if ctx.Config().PlatformSdkFinal() {
|
||||
return false
|
||||
}
|
||||
// If this a module targeting an unreleased SDK (MTS or unbundled builds), return 10000
|
||||
return targetSdkVersionLevel.IsPreview() && (ctx.Config().UnbundledBuildApps() || includedInMts(ctx.Module()))
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user