Merge "Rename ApexName to ApexVariationName" am: a07777d434 am: be9a9035f2

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399831

Change-Id: I31f1d4eedbad29ac1562834ea70eb52e0c543ecd
This commit is contained in:
Treehugger Robot
2020-08-15 07:02:47 +00:00
committed by Automerger Merge Worker
9 changed files with 37 additions and 37 deletions

View File

@@ -1332,7 +1332,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
suffix = append(suffix, ctx.Arch().ArchType.String())
}
if apex, ok := m.module.(ApexModule); ok && !apex.IsForPlatform() {
suffix = append(suffix, apex.ApexName())
suffix = append(suffix, apex.ApexVariationName())
}
ctx.Variable(pctx, "moduleDesc", desc)