summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-22 00:42:27 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-10-22 00:42:27 +0000
commit47c0826a9f2edd2292e9c45eceb403f7dc636ee1 (patch)
treef25bc792b2490d745f336419750ae408e277ab36
parent4551e7cabbb03a4ea2a7834e76f75d15afd2f802 (diff)
parentf62f4228f22029b71fe7d1a04ffd23c7f39bb539 (diff)
Merge "Specify flags_packages property in the android_app-generated rro module" into main
-rw-r--r--java/app.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/app.go b/java/app.go
index 69fdc4772..67a97ce39 100644
--- a/java/app.go
+++ b/java/app.go
@@ -1340,12 +1340,14 @@ func AndroidAppFactory() android.Module {
Aaptflags []string
Manifest *string
Resource_dirs []string
+ Flags_packages []string
}{
Name: proptools.StringPtr(rroPackageName),
Filter_product: proptools.StringPtr(characteristics),
Aaptflags: []string{"--auto-add-overlay"},
Manifest: proptools.StringPtr(":" + rroManifestName),
Resource_dirs: a.aaptProperties.Resource_dirs,
+ Flags_packages: a.aaptProperties.Flags_packages,
}
if !Bool(a.aaptProperties.Aapt_include_all_resources) {
for _, aaptConfig := range ctx.Config().ProductAAPTConfig() {