commit f65a99cee1a7ba7dce59a3a83c0526a2c3ef83d9
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 26 23:14:23 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 26 23:14:23 2018 +0000
tree 5e276ff6e3876601a057fd5efc5a857fe513ba3f
parent b7515421d10cddd56cfb64c4428dfabe0ffa8c85
parent 423e2db0f9dc6e359c8a59467a6c6d23da33764e

Merge "Add product_variables.Use_lmkd_stats_log." into pi-dev

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index 6fe9ca4..bac566f 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -642,8 +642,8 @@
 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
 		}