commit 39c303116a76fe14270ad680da8a9275e7d32903
author Justin Yun <justinyun@google.com> Wed Nov 23 16:20:12 2022 +0900
committer Justin Yun <justinyun@google.com> Thu Nov 24 17:51:08 2022 +0900
tree cfa443c6244c82fd29d6d8900864c2254e0c94d5
parent e315b8b12a191d4c1f5287daedb94291e86c737e

Allow hwasan variant for vendor_snapshot_static modules

vendor_snapshot_static modules can define hwasan variant as below:

vendor_snapshot_static {
    name: "libsnapshot",
    vendor: true,
    version: "33",
    arch: {
        arm64: {
            src: "libsnapshot.a",
            hwasan: {
                src: "libsnapshot.hwasan.a",
            },
        },
    },
}

Bug: 234772527
Test: m nothing
Change-Id: I0725028a4fdc302005d86f1e36561b98c0af623b

cc/androidmk.go

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