Use an option struct in aapt.buildActions & manifestMerger

Change-Id: Ia056ab321e1fd146ed0cdb98fc2d4455601f648c Test: Treehugger
2023-09-27 16:47:56 +00:00
parent 3fb5c15adf
commit f7a1027c6b
4 changed files with 53 additions and 20 deletions
--- a/java/rro.go
+++ b/java/rro.go
@@ -146,7 +146,13 @@ func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleC
 		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)