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

Merge "Temporarily link Vendor APEX with vendor libbinder when VNDK deprecated" into main

Browse Source
This commit is contained in:
Kiyoung Kim
2023-09-08 04:21:17 +00:00
committed by Gerrit Code Review
parent e2e3172dba cbe2ba04b7
commit 86b9b13607
1 changed files with 13 additions and 0 deletions
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 ( import (
"fmt" "fmt"
"log"
"path/filepath" "path/filepath"
"regexp" "regexp"
"sort" "sort"
@@ -991,6 +992,13 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) {
return false 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 // By default, all the transitive dependencies are collected, unless filtered out
// above. // above.
return true return true
@@ -2225,6 +2233,11 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext,
vctx.requireNativeLibs = append(vctx.requireNativeLibs, ":vndk") vctx.requireNativeLibs = append(vctx.requireNativeLibs, ":vndk")
return false 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 := apexFileForNativeLibrary(ctx, ch, vctx.handleSpecialLibs)
af.transitiveDep = true af.transitiveDep = true