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

Merge "apex: remove compat symlinks to vndk apex" am: 58a7d9c371

Browse Source 
Change-Id: Ic065460ace517d09caef395dd6d4bbb78510bf6d
This commit is contained in:
Jooyung Han
2020-04-16 04:15:21 +00:00
committed by Automerger Merge Worker
parent 60bb96d3a6 58a7d9c371
commit a898da2fcc
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apex/vndk.go
View File

@@ -16,6 +16,7 @@ package apex
import (
"path/filepath"
"strconv"
"strings"
"sync"
@@ -121,10 +122,13 @@ func makeCompatSymlinks(name string, ctx android.ModuleContext) (symlinks []stri
// When all hard-coded references are fixed, remove symbolic links
// Note that we should keep following symlinks for older VNDKs (<=29)
// Since prebuilt vndk libs still depend on system/lib/vndk path
if strings.HasPrefix(name, vndkApexName) {
vndkVersion := ctx.DeviceConfig().PlatformVndkVersion()
if strings.HasPrefix(name, vndkApexNamePrefix) {
vndkVersion = strings.TrimPrefix(name, vndkApexNamePrefix)
if strings.HasPrefix(name, vndkApexNamePrefix) {
vndkVersion := strings.TrimPrefix(name, vndkApexNamePrefix)
if numVer, err := strconv.Atoi(vndkVersion); err != nil {
ctx.ModuleErrorf("apex_vndk should be named as %v<ver:number>: %s", vndkApexNamePrefix, name)
return
} else if numVer > android.SdkVersion_Android10 {
return
}
// the name of vndk apex is formatted "com.android.vndk.v" + version
apexName := vndkApexNamePrefix + vndkVersion