From 90c3aca9bfeb152a0e11a315e05799fd847353e3 Mon Sep 17 00:00:00 2001
From: Vic Yang <victoryang@google.com>
Date: Fri, 17 Jan 2020 15:30:44 -0800
Subject: [PATCH] Don't check VNDK variants when asan is used

Bug: 147911208
Test: Build with SANITIZE_TARGET=address
Change-Id: I161da92d2ed5c59ccf404cf93e04734cc85c2df9
---
 core/soong_cc_prebuilt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk
index 0cc055c41f..b095b7c388 100644
--- a/core/soong_cc_prebuilt.mk
+++ b/core/soong_cc_prebuilt.mk
@@ -106,7 +106,7 @@ endif
 
 my_check_same_vndk_variants :=
 ifeq ($(LOCAL_CHECK_SAME_VNDK_VARIANTS),true)
-  ifneq ($(filter hwaddress, $(SANITIZE_TARGET)),hwaddress)
+  ifeq ($(filter hwaddress address, $(SANITIZE_TARGET)),)
     my_check_same_vndk_variants := true
   endif
 endif