openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Use PlatformVndkVersion to find ABI dump by default" am: 8e10408ccf 

am: 4ce86efb67

Change-Id: I365c12d947a1624e35cf9fb0480409870c315e85
This commit is contained in:
Logan Chien 2018-03-24 06:53:51 +00:00 committed by android-build-merger
parent eae3a62827 4ce86efb67
commit 2682eba786
1 changed files with 2 additions and 2 deletions
Show Stats 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
}