Merge "Fix vndk snapshot suffix on Makefile" into rvc-dev
This commit is contained in:
commit
bed2ac5dd6
1 changed files with 6 additions and 1 deletions
7
cc/cc.go
7
cc/cc.go
|
@ -2414,8 +2414,13 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
|
|||
|
||||
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 {
|
||||
|
|
Loading…
Reference in a new issue