| commit | ddd7d0cac94e22fee54dc5f93ee8d34e3a325c69 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 19 07:40:51 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Mar 19 07:40:51 2020 +0000 |
| tree | c514d75e8cdcbde0d0f68ffbef0deb6df05aea2c | |
| parent | 4726b9c8a0360e35fb9b62d016446b0e59d3b3fb [diff] | |
| parent | 752edec2904d5c72e17a50ed0a439ddeac84b812 [diff] |
Merge "Fix vndk snapshot suffix on Makefile"
diff --git a/cc/cc.go b/cc/cc.go index 61ae10a..037b99c 100644 --- a/cc/cc.go +++ b/cc/cc.go
@@ -2433,8 +2433,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 {