commit bed2ac5dd61242cf69d38c099782889a0fd034ef
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 19 01:27:33 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 19 01:27:33 2020 +0000
tree 23ddceaf07642daaeae7d300f0a74a6f2998e651
parent 162e844c40f1425f6b4d48def3ea9a6676f99b5a
parent 7ac1fa7823db60becaa6c503d6ce3148db57df42

Merge "Fix vndk snapshot suffix on Makefile" into rvc-dev

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index 04d30f1..daff3d2 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -2414,8 +2414,13 @@
 
 			if c, ok := ccDep.(*Module); ok {
 				// Use base module name for snapshots when exporting to Makefile.
-				if c.isSnapshotPrebuilt() && !c.IsVndk() {
+				if c.isSnapshotPrebuilt() {
 					baseName := c.BaseModuleName()
+
+					if c.IsVndk() {
+						return baseName + ".vendor"
+					}
+
 					if vendorSuffixModules[baseName] {
 						return baseName + ".vendor"
 					} else {