From 4a4c834b096979222d18efe0a7de45d947bbb7b3 Mon Sep 17 00:00:00 2001
From: Oliver Nguyen <olivernguyen@google.com>
Date: Mon, 24 Feb 2020 15:18:45 -0800
Subject: [PATCH] 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk
index 190a7edba1..f22c5628e4 100644
--- a/core/soong_cc_prebuilt.mk
+++ b/core/soong_cc_prebuilt.mk
@@ -112,7 +112,9 @@ endif
 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