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