commit 97c03a6dc659102ff40793759fb3f0f18164a85b
author Joe Onorato <joeo@google.com> Tue Jan 30 01:24:59 2024 +0000
committer Joe Onorato <joeo@google.com> Sat Feb 03 16:42:09 2024 -0800
tree ff8d68027999d6d3d047ef5ae36c78128858721a
parent 13065ce6afc38449b445f909093c97a287314b7a

Automatically propagate jarjar rules for aconfig libraries

Test: treehugger
Bug: 310504781
Change-Id: I639d12ff33175b7bed7e7d0595a40dd9b0d99367

java/dex.go

diff --git a/java/dex.go b/java/dex.go
index cdae0a2..4474c63 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -262,7 +262,7 @@
 	var proguardRaiseDeps classpath
 	ctx.VisitDirectDepsWithTag(proguardRaiseTag, func(m android.Module) {
 		dep, _ := android.OtherModuleProvider(ctx, m, JavaInfoProvider)
-		proguardRaiseDeps = append(proguardRaiseDeps, dep.HeaderJars...)
+		proguardRaiseDeps = append(proguardRaiseDeps, dep.RepackagedHeaderJars...)
 	})
 
 	r8Flags = append(r8Flags, proguardRaiseDeps.FormJavaClassPath("-libraryjars"))