From 03d014ff2beaf006a76d89f710fdceffc41ebbf6 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Fri, 16 Feb 2024 22:22:18 +0000 Subject: [PATCH] Add jarjar_prefix propagation support for aconfig_declarations_group module type jarjar_prefix propagation logic currently depends on the type of the providers of the dependencies, thus the logic needs to be updated when a new provider is added. Since `aconfig_declarations_group` module type utilizes its custom provider "CodegenInfoProvider", this change adds jarjar_prefix propagation support for this provider. Test: Set aconfig_declaration module's exportable property to true && m framework-minus-apex and inspect if "repackaged-jarjar" subdir exists in outdir Bug: 310504781 Change-Id: I1689027d7810687a53ec34b9cfda479806f2ec87 --- java/base.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/base.go b/java/base.go index e2c4d327b..7f4ea08c7 100644 --- a/java/base.go +++ b/java/base.go @@ -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: