StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore proguardRaiseTag in jarjar repackage

Browse Source 
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
This commit is contained in:
Zi Wang
2024-02-07 19:57:14 +00:00
committed by Android Build Cherrypicker Worker
parent 617b3e288a
commit bacee38680
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/base.go
View File

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