summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mårten Kongstad <amhk@google.com> 2025-03-12 21:08:30 +0100
committer Mårten Kongstad <amhk@google.com> 2025-03-13 09:11:11 +0100
commit8585cd0fd796c7a8e6b343dfe6a690ce5014db39 (patch)
tree4941192ca7bf18be94ce6728755293458687bda6
parent5b10fad64f13666bd916a0b7143d1211b3c6c2f7 (diff)
Revert "Baklava finalization special"
This reverts commit 45fc16c6f7ef539943efa082450f160ac1075735. Baklava has been finalized and the prebuilts/sdk/36 directory has been created, and the version bumps have propagated to trunk. We no longer need to special case the call to metalava. Bug: 379105862 Test: presubmit Ignore-AOSP-First: special call to metalava does not exist in AOSP Change-Id: I2a49e917ce7f5ec43a189dd0fe910433a1c95332
-rw-r--r--java/droidstubs.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/java/droidstubs.go b/java/droidstubs.go
index 40d6f18f2..7d4a8b8f5 100644
--- a/java/droidstubs.go
+++ b/java/droidstubs.go
@@ -573,9 +573,7 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a
} else {
cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String())
}
- if ctx.Config().PlatformSdkVersion().String() != "36" || ctx.Config().PlatformSdkCodename() != "Baklava" {
- cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
- }
+ cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
cmd.FlagWithInput("--apply-api-levels ", apiVersions)
}
}