commit 930610f64b2690f5d704ef1df0792d5eb25ff8a7
author Jeff Sharkey <jsharkey@google.com> Tue Jun 15 03:51:41 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 15 03:51:41 2021 +0000
tree 31ba14ee8df67089126d9f5f6b1cfdf93e887717
parent fb618c387a487413885382ab1a0534c81dba4669
parent 46d18dbd7a3e39eb9623760f12ac9cf40457c9ae

Merge "Revert "Hacky workaround for half-finalized builds."" into sc-dev

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")