commit 50493f07979fd25c57cc3ae3755c66c04b5aee4a
author Jeff Sharkey <jsharkey@android.com> Tue Jun 01 12:12:31 2021 -0600
committer Anton Hansson <hansson@google.com> Wed Apr 13 12:36:52 2022 +0000
tree bccf133f5c309348f9223bdee48c3f02484ac499
parent 8823526801d84c92a6736787fa4cd020a284dd8b

Hacky workaround for half-finalized builds.

Metalava increments the SDK level by one when it's not "REL", so we
temporarily force the build to be "REL" while we're still in the
process of finalizing it.

This CL must be reverted as part of actually declaring "REL".

Bug: 171506470
Test: Build
(cherry picked from commit 05597c0cc44964f11c8e711d2d03b8dea221b7b9)

Change-Id: I18405cdd27769598f5e7a6a968f0dd473f936f6c

java/droidstubs.go

diff --git a/java/droidstubs.go b/java/droidstubs.go
index 3b1f7c0..d444738 100644
--- a/java/droidstubs.go
+++ b/java/droidstubs.go
@@ -379,7 +379,8 @@
 	cmd.FlagWithOutput("--generate-api-levels ", d.apiVersionsXml)
 	cmd.FlagWithInput("--apply-api-levels ", d.apiVersionsXml)
 	cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String())
-	cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
+	// STOPSHIP: RESTORE THIS LOGIC WHEN DECLARING "REL" BUILD
+	// cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
 
 	filename := proptools.StringDefault(d.properties.Api_levels_jar_filename, "android.jar")