Merge "Fix the problem of resource integration confusion caused by not adding regional configuration tailoring." into main

This commit is contained in:
Joe Onorato
2024-05-22 00:02:04 +00:00
committed by Gerrit Code Review

View File

@@ -1284,6 +1284,11 @@ func AndroidAppFactory() android.Module {
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)
})