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
This commit is contained in:
@@ -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),
|
||||
},
|
||||
)
|
||||
|
||||
|
Reference in New Issue
Block a user