summaryrefslogtreecommitdiff
path: root/java/rro.go
diff options
context:
space:
mode:
author Alix <agespino@google.com> 2023-09-27 16:47:56 +0000
committer Alix <agespino@google.com> 2023-10-10 14:31:03 +0000
commitf7a1027c6bf0c661f8f89b6a84e8fe22f2fc44fe (patch)
tree9b6ad234349e61480b15e3908a41c42c7c514865 /java/rro.go
parent3fb5c15adf5bca630f6d90df071e5fcfad00acf9 (diff)
Use an option struct in aapt.buildActions & manifestMerger
Change-Id: Ia056ab321e1fd146ed0cdb98fc2d4455601f648c Test: Treehugger
Diffstat (limited to 'java/rro.go')
-rw-r--r--java/rro.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/java/rro.go b/java/rro.go
index 53faca069..3e0f8e94d 100644
--- 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)