diff --git a/cc/androidmk.go b/cc/androidmk.go
index 58bb57c..4ae099f 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -540,8 +540,10 @@
 
 	entries.SubName = ""
 
-	if c.sanitizerProperties.CfiEnabled {
+	if c.isSanitizerEnabled(cfi) {
 		entries.SubName += ".cfi"
+	} else if c.isSanitizerEnabled(Hwasan) {
+		entries.SubName += ".hwasan"
 	}
 
 	entries.SubName += c.baseProperties.Androidmk_suffix