tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Ignore proguardRaiseTag in jarjar repackage" into main

Browse source
This commit is contained in:
Zi Wang 2024-02-07 23:58:23 +00:00 committed by Gerrit Code Review
commit 5eab6d0a31
1 changed files with 3 additions and 0 deletions
Show stats 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
// 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 {