From 8585cd0fd796c7a8e6b343dfe6a690ce5014db39 Mon Sep 17 00:00:00 2001 From: Mårten Kongstad Date: Wed, 12 Mar 2025 21:08:30 +0100 Subject: 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 --- java/droidstubs.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'java') 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) } } -- cgit v1.2.3-59-g8ed1b