Flags in autogenerated RROs
aapt2 build actions in autogenerated RROs currently do not use aconfig
flags. This CL fixes that.
Test: m framework-res with the CLs and product of https://yaqs.corp.google.com/eng/q/2623015829943353344
Change-Id: I2ab256ff0382a28c3287804c92d654cb3fac4401
diff --git a/java/app.go b/java/app.go
index abbf034..a06136a 100644
--- a/java/app.go
+++ b/java/app.go
@@ -581,7 +581,7 @@
ctx.VisitDirectDepsProxy(func(dep android.ModuleProxy) {
tag := ctx.OtherModuleDependencyTag(dep)
switch tag {
- case staticLibTag:
+ case staticLibTag, rroDepTag:
if flagPackages, ok := android.OtherModuleProvider(ctx, dep, FlagsPackagesProvider); ok {
aconfigTextFilePaths = append(aconfigTextFilePaths, flagPackages.AconfigTextFiles...)
}
diff --git a/java/rro.go b/java/rro.go
index d9f4ff7..9884fee 100644
--- a/java/rro.go
+++ b/java/rro.go
@@ -391,10 +391,11 @@
a.aapt.buildActions(ctx,
aaptBuildActionOptions{
- sdkContext: a,
- extraLinkFlags: aaptLinkFlags,
- rroDirs: &rroDirs,
- manifestForAapt: genManifest,
+ sdkContext: a,
+ extraLinkFlags: aaptLinkFlags,
+ rroDirs: &rroDirs,
+ manifestForAapt: genManifest,
+ aconfigTextFiles: getAconfigFilePaths(ctx),
},
)