diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-01 23:01:07 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-01 23:01:07 +0000 |
| commit | 50dc6d284045059c211fd0ef57438dd2878b946f (patch) | |
| tree | 9341c41e3b5f12343964aab0d376586306471077 /java/android_manifest.go | |
| parent | 6d4db21ce6e1671f8908880dc9ba38d22265c200 (diff) | |
| parent | e792debb72bb9dce95ebcfb4d9fce2cc36bc05c7 (diff) | |
| download | soong-50dc6d284045059c211fd0ef57438dd2878b946f.tar.gz | |
Snap for 10043601 from e792debb72bb9dce95ebcfb4d9fce2cc36bc05c7 to udc-release
Change-Id: I0eb163c5e6acb32dac6efa5fc478ba753c08535d
Diffstat (limited to 'java/android_manifest.go')
| -rw-r--r-- | java/android_manifest.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/android_manifest.go b/java/android_manifest.go index dbcf09830..f2ebfa6a2 100644 --- a/java/android_manifest.go +++ b/java/android_manifest.go @@ -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())) } |