From 9f442dc5d42ef0bcaa8a08cc87ed76c8877d5b74 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Wed, 20 Mar 2024 22:09:04 +0000 Subject: 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 --- java/rro.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'java/rro.go') 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), }, ) -- cgit v1.2.3-59-g8ed1b