diff --git a/android/module.go b/android/module.go
index 5e56c4f..fd3fec3 100644
--- a/android/module.go
+++ b/android/module.go
@@ -1112,6 +1112,9 @@
 	if !ctx.PrimaryArch() {
 		suffix = append(suffix, ctx.Arch().ArchType.String())
 	}
+	if apex, ok := m.module.(ApexModule); ok && !apex.IsForPlatform() {
+		suffix = append(suffix, apex.ApexName())
+	}
 
 	ctx.Variable(pctx, "moduleDesc", desc)