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

This commit is contained in:
TreeHugger Robot 2020-03-19 01:27:33 +00:00 committed by Android (Google) Code Review
commit bed2ac5dd6

View file

@ -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 {