diff --git a/java/droidstubs.go b/java/droidstubs.go
index 40d6f18..7d4a8b8 100644
--- a/java/droidstubs.go
+++ b/java/droidstubs.go
@@ -573,9 +573,7 @@
 		} else {
 			cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String())
 		}
-		if ctx.Config().PlatformSdkVersion().String() != "36" || ctx.Config().PlatformSdkCodename() != "Baklava" {
-			cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
-		}
+		cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
 		cmd.FlagWithInput("--apply-api-levels ", apiVersions)
 	}
 }