summaryrefslogtreecommitdiff
path: root/java/app.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/app.go
parent3fb5c15adf5bca630f6d90df071e5fcfad00acf9 (diff)
Use an option struct in aapt.buildActions & manifestMerger
Change-Id: Ia056ab321e1fd146ed0cdb98fc2d4455601f648c Test: Treehugger
Diffstat (limited to 'java/app.go')
-rwxr-xr-xjava/app.go11
1 files changed, 9 insertions, 2 deletions
diff --git a/java/app.go b/java/app.go
index 166c22d94..ce94ababd 100755
--- a/java/app.go
+++ b/java/app.go
@@ -481,8 +481,15 @@ func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) {
if a.Updatable() {
a.aapt.defaultManifestVersion = android.DefaultUpdatableModuleVersion
}
- a.aapt.buildActions(ctx, android.SdkContext(a), a.classLoaderContexts,
- a.usesLibraryProperties.Exclude_uses_libs, a.enforceDefaultTargetSdkVersion(), aaptLinkFlags...)
+ a.aapt.buildActions(ctx,
+ aaptBuildActionOptions{
+ android.SdkContext(a),
+ a.classLoaderContexts,
+ a.usesLibraryProperties.Exclude_uses_libs,
+ a.enforceDefaultTargetSdkVersion(),
+ aaptLinkFlags,
+ },
+ )
// apps manifests are handled by aapt, don't let Module see them
a.properties.Manifest = nil