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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-19 01:27:33 +00:00
committed by Android (Google) Code Review
parent 162e844c40 7ac1fa7823
commit bed2ac5dd6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/cc.go
View File

@@ -2414,8 +2414,13 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
if c, ok := ccDep.(*Module); ok { if c, ok := ccDep.(*Module); ok {
// Use base module name for snapshots when exporting to Makefile. // Use base module name for snapshots when exporting to Makefile.
if c.isSnapshotPrebuilt() && !c.IsVndk() { if c.isSnapshotPrebuilt() {
baseName := c.BaseModuleName() baseName := c.BaseModuleName()
if c.IsVndk() {
return baseName + ".vendor"
}
if vendorSuffixModules[baseName] { if vendorSuffixModules[baseName] {
return baseName + ".vendor" return baseName + ".vendor"
} else { } else {