commit f7a1027c6bf0c661f8f89b6a84e8fe22f2fc44fe
author Alix <agespino@google.com> Wed Sep 27 16:47:56 2023 +0000
committer Alix <agespino@google.com> Tue Oct 10 14:31:03 2023 +0000
tree 9b6ad234349e61480b15e3908a41c42c7c514865
parent 3fb5c15adf5bca630f6d90df071e5fcfad00acf9

Use an option struct in aapt.buildActions & manifestMerger

Change-Id: Ia056ab321e1fd146ed0cdb98fc2d4455601f648c
Test: Treehugger

java/rro.go

diff --git a/java/rro.go b/java/rro.go
index 53faca0..3e0f8e9 100644
--- a/java/rro.go
+++ b/java/rro.go
@@ -146,7 +146,13 @@
 		aaptLinkFlags = append(aaptLinkFlags,
 			"--rename-overlay-category "+*r.overridableProperties.Category)
 	}
-	r.aapt.buildActions(ctx, r, nil, nil, false, aaptLinkFlags...)
+	r.aapt.buildActions(ctx,
+		aaptBuildActionOptions{
+			sdkContext:                     r,
+			enforceDefaultTargetSdkVersion: false,
+			extraLinkFlags:                 aaptLinkFlags,
+		},
+	)
 
 	// Sign the built package
 	_, _, certificates := collectAppDeps(ctx, r, false, false)