commit 4a4c834b096979222d18efe0a7de45d947bbb7b3
author Oliver Nguyen <olivernguyen@google.com> Mon Feb 24 15:18:45 2020 -0800
committer Oliver Nguyen <olivernguyen@google.com> Mon Feb 24 15:18:45 2020 -0800
tree 6e8b1e9fda894f56971e78ba9155b2bfcb93f2b7
parent 9581181338cbbfaedce97d7937bb9c23ed60d310

Skip VNDK variant check on coverage builds.

Coverage builds result in different core and vendor variants due to
different coverage metadata from static libraries. Skip this check only
on coverage builds.

Bug: 143977934
Test: m CLANG_COVERAGE=true COVERAGE_PATHS='*'
Change-Id: I906745e951b36a87cedf998a93bdc390196a606e

core/soong_cc_prebuilt.mk

diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk
index 190a7ed..f22c562 100644
--- a/core/soong_cc_prebuilt.mk
+++ b/core/soong_cc_prebuilt.mk
@@ -112,7 +112,9 @@
 my_check_same_vndk_variants :=
 ifeq ($(LOCAL_CHECK_SAME_VNDK_VARIANTS),true)
   ifeq ($(filter hwaddress address, $(SANITIZE_TARGET)),)
-    my_check_same_vndk_variants := true
+    ifneq ($(CLANG_COVERAGE),true)
+      my_check_same_vndk_variants := true
+    endif
   endif
 endif