commit a78856cee6de9e15558053dc393de66ce3ee734e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 05 00:04:48 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 05 00:04:48 2020 +0000
tree e13f310ab6a12dad90a7725c8b5e677357a8312c
parent f39863dc7a01e1d3a8ba8719cd0da84eff6afd62
parent 791a8b51281e1d7f1e1ebeefcedf1ae503650980

Merge "Skip VNDK variant check on coverage builds." am: 791a8b5128

Change-Id: I506aac7d8dfe868ac123d7b68628e5e67864998e

core/soong_cc_prebuilt.mk

diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk
index 7853890..6317b53 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