From 46d18dbd7a3e39eb9623760f12ac9cf40457c9ae Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 7 Jun 2021 11:10:14 -0600 Subject: [PATCH] Revert "Hacky workaround for half-finalized builds." This reverts commit 05597c0cc44964f11c8e711d2d03b8dea221b7b9. Bug: 171506470 Test: Build Change-Id: Id45b2eec2c9c1ba1a33ba35232229004d67c026c --- java/droidstubs.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java/droidstubs.go b/java/droidstubs.go index eed252800..c756815c6 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -363,8 +363,7 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a cmd.FlagWithOutput("--generate-api-levels ", d.apiVersionsXml) cmd.FlagWithInput("--apply-api-levels ", d.apiVersionsXml) cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String()) - // STOPSHIP: RESTORE THIS LOGIC WHEN DECLARING "REL" BUILD - // cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename()) + cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename()) filename := proptools.StringDefault(d.properties.Api_levels_jar_filename, "android.jar")