Remove Device VNDK version usage from Soong
As of VNDK deprecation, Device VNDK version should no longer be used from build. This change removes all references on Device VNDK version and related logic with it. Bug: 330100430 Test: AOSP CF build succeeded Change-Id: Ibc290f0b41e8321f80c75c69f810223989af68dc
This commit is contained in:
@@ -17,7 +17,6 @@ package cc
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strconv"
|
||||
@@ -753,20 +752,6 @@ func (library *libraryDecorator) getLibNameHelper(baseModuleName string, inVendo
|
||||
func (library *libraryDecorator) getLibName(ctx BaseModuleContext) string {
|
||||
name := library.getLibNameHelper(ctx.baseModuleName(), ctx.inVendor(), ctx.inProduct())
|
||||
|
||||
// Replace name with VNDK ext as original lib only when VNDK is enabled
|
||||
if ctx.IsVndkExt() {
|
||||
if ctx.DeviceConfig().VndkVersion() != "" {
|
||||
// vndk-ext lib should have the same name with original lib
|
||||
ctx.VisitDirectDepsWithTag(vndkExtDepTag, func(module android.Module) {
|
||||
originalName := module.(*Module).outputFile.Path()
|
||||
name = strings.TrimSuffix(originalName.Base(), originalName.Ext())
|
||||
})
|
||||
} else {
|
||||
// TODO(b/320208784) : Suggest a solution for former VNDK-ext libraries before VNDK deprecation.
|
||||
log.Printf("VNDK Extension on module %s will not be available once VNDK is deprecated", ctx.baseModuleName())
|
||||
}
|
||||
}
|
||||
|
||||
if ctx.Host() && Bool(library.Properties.Unique_host_soname) {
|
||||
if !strings.HasSuffix(name, "-host") {
|
||||
name = name + "-host"
|
||||
|
Reference in New Issue
Block a user