summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@google.com> 2021-06-15 03:51:41 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-06-15 03:51:41 +0000
commit930610f64b2690f5d704ef1df0792d5eb25ff8a7 (patch)
tree31ba14ee8df67089126d9f5f6b1cfdf93e887717 /java
parentfb618c387a487413885382ab1a0534c81dba4669 (diff)
parent46d18dbd7a3e39eb9623760f12ac9cf40457c9ae (diff)
Merge "Revert "Hacky workaround for half-finalized builds."" into sc-dev
Diffstat (limited to 'java')
-rw-r--r--java/droidstubs.go3
1 files changed, 1 insertions, 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")