commit 90c3aca9bfeb152a0e11a315e05799fd847353e3
author Vic Yang <victoryang@google.com> Fri Jan 17 15:30:44 2020 -0800
committer Vic Yang <victoryang@google.com> Fri Jan 17 15:30:44 2020 -0800
tree fe7fd2f0ebf44c691f5618adb9986ae9a2110333
parent 5023711e9ddfdf0935ee1f427537c94c3eb3db76

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

diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk
index 0cc055c..b095b7c 100644
--- a/core/soong_cc_prebuilt.mk
+++ b/core/soong_cc_prebuilt.mk
@@ -106,7 +106,7 @@
 
 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