From 7152e82a422693dafe3384c1bf4acf7417ed125b Mon Sep 17 00:00:00 2001
From: Rico Wind <ricow@google.com>
Date: Fri, 19 Apr 2024 08:14:15 +0200
Subject: [PATCH] Enable non final ids for non BusyBox builds

Non final ids is a prerequisite for using optimized shrinking and
it will soon be a hard R8 error if you pass final ids in R classes
with optimized shrinking enabled.

Bug: 325905703
Test: SystemUIGo with optimized shrinking
Change-Id: I364edc5a0b22be7b4d737c2aa470a84704d05283
---
 java/aar.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java/aar.go b/java/aar.go
index a36626732..9db39b7e6 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -417,6 +417,9 @@ func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptio
 	if a.isLibrary {
 		linkFlags = append(linkFlags, "--static-lib")
 	}
+	if opts.forceNonFinalResourceIDs {
+		linkFlags = append(linkFlags, "--non-final-ids")
+	}
 
 	linkFlags = append(linkFlags, "--no-static-lib-packages")
 	if a.isLibrary && a.useResourceProcessorBusyBox(ctx) {