diff options
| author | 2024-03-20 22:09:04 +0000 | |
|---|---|---|
| committer | 2024-03-20 22:18:17 +0000 | |
| commit | 9f442dc5d42ef0bcaa8a08cc87ed76c8877d5b74 (patch) | |
| tree | ee5c22fe14bec394bec817d5ba15d2a4428af030 /java/rro.go | |
| parent | 8426848ade55170fc6cf543b5dfc6bd97333c7d3 (diff) | |
Add aconfig flag support for runtime_resource_overlay
This change adds the support that was added to android_app in
https://r.android.com/2854663 for runtime_resource_overlay modules.
Implementation details:
- Add flags_packages as dependencies of runtime_resouce_overlay modules
- Pass the collected aconfig intermediate cache files to the
aconfigBuildActionOptions.
Test: m nothing --no-skip-soong-tests
Bug: 330222981
Change-Id: I3e20f18e58be689ca32852f7bf0b7ea16024856b
Diffstat (limited to 'java/rro.go')
| -rw-r--r-- | java/rro.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/rro.go b/java/rro.go index 3e0f8e94d..72170fc6d 100644 --- a/java/rro.go +++ b/java/rro.go @@ -122,6 +122,10 @@ func (r *RuntimeResourceOverlay) DepsMutator(ctx android.BottomUpMutatorContext) ctx.AddVariationDependencies(nil, staticLibTag, r.properties.Static_libs...) ctx.AddVariationDependencies(nil, libTag, r.properties.Resource_libs...) + + for _, aconfig_declaration := range r.aaptProperties.Flags_packages { + ctx.AddDependency(ctx.Module(), aconfigDeclarationTag, aconfig_declaration) + } } func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleContext) { @@ -151,6 +155,7 @@ func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleC sdkContext: r, enforceDefaultTargetSdkVersion: false, extraLinkFlags: aaptLinkFlags, + aconfigTextFiles: getAconfigFilePaths(ctx), }, ) |