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

Merge "Use PlatformVndkVersion to find ABI dump by default"

Browse Source 
am: 8e10408ccf

Change-Id: I797c676bb76bd07bd53e877c675d1d645a77719c
This commit is contained in:
Logan Chien
2018-03-23 21:42:57 +00:00
committed by android-build-merger
parent c9e08d397c 8e10408ccf
commit 4ce86efb67
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/library.go
View File

@@ -642,8 +642,8 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext,
func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objects, fileName string, soFile android.Path) {
//Also take into account object re-use.
if len(objs.sAbiDumpFiles) > 0 && ctx.createVndkSourceAbiDump() {
vndkVersion := "current"
if ver := ctx.DeviceConfig().VndkVersion(); ver != "" {
vndkVersion := ctx.DeviceConfig().PlatformVndkVersion()
if ver := ctx.DeviceConfig().VndkVersion(); ver != "" && ver != "current" {
vndkVersion = ver
}