Ignore proguardRaiseTag in jarjar repackage

Test: CI

Bug: 310504781

Ignore-AOSP-First: Will cp to aosp
Change-Id: I1c926f374cc6e0f963c32d049ea120b8fbf18eb1
This commit is contained in:
Zi Wang
2024-02-06 16:42:35 -08:00
parent deb58b1532
commit ffd200a125

View File

@@ -2441,6 +2441,9 @@ func collectDirectDepsProviders(ctx android.ModuleContext) (result *JarJarProvid
// Gather repackage information from deps
// If the dep jas a JarJarProvider, it is used. Otherwise, any BaseJarJarProvider is used.
ctx.VisitDirectDepsIgnoreBlueprint(func(m android.Module) {
if ctx.OtherModuleDependencyTag(m) == proguardRaiseTag {
return
}
merge := func(theirs *JarJarProviderData) {
for orig, renamed := range theirs.Rename {
if result == nil {