| commit | bacee38680ec91b4f68c4102809b38c80b74f3d3 | [log] [tgz] |
|---|---|---|
| author | Zi Wang <mrziwang@google.com> | Wed Feb 07 19:57:14 2024 +0000 |
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Wed Feb 07 19:57:14 2024 +0000 |
| tree | 3601bca7f46833a5654a5407b2335b60081cf609 | |
| parent | 617b3e288a68e4b6ad34a703b95749c044305e42 [diff] [blame] |
Ignore proguardRaiseTag in jarjar repackage Test: CI Bug: 310504781 Ignore-AOSP-First: Will cp to aosp (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ffd200a12546237b1ac0f615c73cb3c9614a8237) Merged-In: I1c926f374cc6e0f963c32d049ea120b8fbf18eb1 Change-Id: I1c926f374cc6e0f963c32d049ea120b8fbf18eb1
diff --git a/java/base.go b/java/base.go index 284ec99..4e2366f 100644 --- a/java/base.go +++ b/java/base.go
@@ -2441,6 +2441,9 @@ // 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 {