xref: /aosp_15_r20/build/make/tools/finalization/build_soong_java_droidstubs.go.revert_hack.diff (revision 9e94795a3d4ef5c1d47486f9a02bb378756cea8a)
1From c0f6e8fe4c3b6803be97aeea6683631d616412f4 Mon Sep 17 00:00:00 2001
2From: Alex Buynytskyy <[email protected]>
3Date: Thu, 08 Dec 2022 17:52:52 +0000
4Subject: [PATCH] Revert "Hacky workaround for half-finalized builds."
5
6This reverts commit 12eea1512f2612f41b5cf7004ee2e6a189d548d7.
7
8Reason for revert: finalization-2
9
10Change-Id: Ifc801271628808693b1cb20206f8f81c9a6c694d
11---
12
13diff --git a/java/droidstubs.go b/java/droidstubs.go
14index ec4a0f4..5777b18 100644
15--- a/java/droidstubs.go
16+++ b/java/droidstubs.go
17@@ -386,8 +386,7 @@
18 	}
19 	if apiVersions != nil {
20 		cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String())
21-		// STOPSHIP: RESTORE THIS LOGIC WHEN DECLARING "REL" BUILD
22-		// cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
23+		cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
24 		cmd.FlagWithInput("--apply-api-levels ", apiVersions)
25 	}
26 }
27