Merge "Add jarjar_prefix propagation support for aconfig_declarations_group module type" into main

This commit is contained in:
Zi Wang
2024-02-17 01:24:09 +00:00
committed by Gerrit Code Review

View File

@@ -26,6 +26,7 @@ import (
"github.com/google/blueprint/pathtools"
"github.com/google/blueprint/proptools"
"android/soong/aconfig"
"android/soong/android"
"android/soong/dexpreopt"
"android/soong/java/config"
@@ -2544,6 +2545,8 @@ func collectDirectDepsProviders(ctx android.ModuleContext) (result *JarJarProvid
default:
return RenameUseExclude, "srcfile"
}
} else if _, ok := android.OtherModuleProvider(ctx, m, aconfig.CodegenInfoProvider); ok {
return RenameUseInclude, "aconfig_declarations_group"
} else {
switch tag {
case bootClasspathTag: