Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2559a85a authored by Zi Wang's avatar Zi Wang Committed by Automerger Merge Worker
Browse files

Merge "Add jarjar_prefix propagation support for aconfig_declarations_group... 

Merge "Add jarjar_prefix propagation support for aconfig_declarations_group module type" into main am: 0fd4bb8c

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967332



Change-Id: I0aedb1a1c34054269666a6f25624c68e079a73f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9600a3d 0fd4bb8c

java/base.go

+3 −0
Original line number Diff line number Diff line
@@ -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: