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

Merge "Temporarily link Vendor APEX with vendor libbinder when VNDK deprecated" into main am: 86b9b13607

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745154

Change-Id: Id640ac2372baf89014673977f8fda161e3f95442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kiyoung Kim 2023-09-08 04:32:20 +00:00 committed by Automerger Merge Worker
commit 07ecfae79e
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apex/apex.go
View file

@ -18,6 +18,7 @@ package apex
import (
"fmt"
"log"
"path/filepath"
"regexp"
"sort"
@ -991,6 +992,13 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) {
return false
}
}
//TODO: b/296491928 Vendor APEX should use libbinder.ndk instead of libbinder once VNDK is fully deprecated.
if useVndk && mctx.Config().IsVndkDeprecated() && child.Name() == "libbinder" {
log.Print("Libbinder is linked from Vendor APEX ", a.Name(), " with module ", parent.Name())
return false
}
// By default, all the transitive dependencies are collected, unless filtered out
// above.
return true
@ -2225,6 +2233,11 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext,
vctx.requireNativeLibs = append(vctx.requireNativeLibs, ":vndk")
return false
}
//TODO: b/296491928 Vendor APEX should use libbinder.ndk instead of libbinder once VNDK is fully deprecated.
if ch.UseVndk() && ctx.Config().IsVndkDeprecated() && child.Name() == "libbinder" {
return false
}
af := apexFileForNativeLibrary(ctx, ch, vctx.handleSpecialLibs)
af.transitiveDep = true