diff options
| -rw-r--r-- | java/app.go | 2 | ||||
| -rw-r--r-- | java/rro.go | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/java/app.go b/java/app.go index abbf034fa..a06136ae2 100644 --- a/java/app.go +++ b/java/app.go @@ -581,7 +581,7 @@ func getAconfigFilePaths(ctx android.ModuleContext) (aconfigTextFilePaths androi 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 d9f4ff7c8..9884feeeb 100644 --- a/java/rro.go +++ b/java/rro.go @@ -391,10 +391,11 @@ func (a *AutogenRuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android. a.aapt.buildActions(ctx, aaptBuildActionOptions{ - sdkContext: a, - extraLinkFlags: aaptLinkFlags, - rroDirs: &rroDirs, - manifestForAapt: genManifest, + sdkContext: a, + extraLinkFlags: aaptLinkFlags, + rroDirs: &rroDirs, + manifestForAapt: genManifest, + aconfigTextFiles: getAconfigFilePaths(ctx), }, ) |