Merge "Add jarjar_prefix propagation support for aconfig_declarations_group module type" into main am: 0fd4bb8c70 am: 2559a85af4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967332
Change-Id: I90376ba499d5845607c58baaa09d232d83c81f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/java/base.go b/java/base.go
index e2c4d32..7f4ea08 100644
--- a/java/base.go
+++ b/java/base.go
@@ -26,6 +26,7 @@
"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 @@
default:
return RenameUseExclude, "srcfile"
}
+ } else if _, ok := android.OtherModuleProvider(ctx, m, aconfig.CodegenInfoProvider); ok {
+ return RenameUseInclude, "aconfig_declarations_group"
} else {
switch tag {
case bootClasspathTag: