Merge "Fix the problem of resource integration confusion caused by not adding regional configuration tailoring." into main am: 30f6e28295
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3092729
Change-Id: Id88e7feb94b8a1eecb9297b4cdfe5eb3527f645b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/java/app.go b/java/app.go
index ea72157..d2f2d0b 100644
--- a/java/app.go
+++ b/java/app.go
@@ -1284,6 +1284,11 @@
Manifest: proptools.StringPtr(":" + rroManifestName),
Resource_dirs: a.aaptProperties.Resource_dirs,
}
+ if !Bool(a.aaptProperties.Aapt_include_all_resources) {
+ for _, aaptConfig := range ctx.Config().ProductAAPTConfig() {
+ rroProperties.Aaptflags = append(rroProperties.Aaptflags, "-c", aaptConfig)
+ }
+ }
ctx.CreateModule(RuntimeResourceOverlayFactory, &rroProperties)
})