commit | 7c42c3f55e1dca69175e4c787a65ee4acca0dcec | [log] [tgz] |
---|---|---|
author | Vic Yang <victoryang@google.com> | Sat Jan 18 04:45:49 2020 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sat Jan 18 04:45:49 2020 +0000 |
tree | fe7fd2f0ebf44c691f5618adb9986ae9a2110333 | |
parent | 5023711e9ddfdf0935ee1f427537c94c3eb3db76 [diff] | |
parent | 90c3aca9bfeb152a0e11a315e05799fd847353e3 [diff] |
Merge "Don't check VNDK variants when asan is used"
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