diff options
| author | 2024-02-07 19:57:14 +0000 | |
|---|---|---|
| committer | 2024-02-07 19:57:14 +0000 | |
| commit | bacee38680ec91b4f68c4102809b38c80b74f3d3 (patch) | |
| tree | 3601bca7f46833a5654a5407b2335b60081cf609 /java/base.go | |
| parent | 617b3e288a68e4b6ad34a703b95749c044305e42 (diff) | |
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
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/base.go b/java/base.go index 284ec9918..4e2366f7d 100644 --- a/java/base.go +++ b/java/base.go @@ -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 { |