commit 46d18dbd7a3e39eb9623760f12ac9cf40457c9ae
author Jeff Sharkey <jsharkey@android.com> Mon Jun 07 11:10:14 2021 -0600
committer Jeff Sharkey <jsharkey@android.com> Sun Jun 13 18:15:26 2021 -0600
tree e4a0de31ee10c7ea9693ba5498fc831040301bb0
parent dce07137393c5d32060bbbab8a5b09fe0625b10e

Revert "Hacky workaround for half-finalized builds."

This reverts commit 05597c0cc44964f11c8e711d2d03b8dea221b7b9.

Bug: 171506470
Test: Build
Change-Id: Id45b2eec2c9c1ba1a33ba35232229004d67c026c

java/droidstubs.go

diff --git a/java/droidstubs.go b/java/droidstubs.go
index eed2528..c756815 100644
--- a/java/droidstubs.go
+++ b/java/droidstubs.go
@@ -363,8 +363,7 @@
 	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")