commit 7ae3ce79aa984a0a1119680041ef4bbdcfb30b53
author Kiyoung Kim <kiyoungkim@google.com> Mon Jun 29 11:06:16 2020 +0900
committer Kiyoung Kim <kiyoungkim@google.com> Mon Jul 20 05:39:29 2020 +0000
tree 7779afc2355603781b574af16a320555e1728fa4
parent 997d2276487ed4a07478073702f9fc0c354f8284

Deprecate VNDK-Lite

Android S would not support upgrade from O-MR1 devices, so VNDK Lite
configuration is no more valid. This change removes all VNDK-Lite
related steps and makr BOARD_VNDK_RUNTIME_DISABLE as deprecated
variable.

Bug: 158719241
Test: m -j passed
Change-Id: Ifb355da936933843862426e7ddfce9c7f69cea61
Merged-In: Ifb355da936933843862426e7ddfce9c7f69cea61

core/soong_cc_prebuilt.mk

diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk
index 986609b..c9b742a 100644
--- a/core/soong_cc_prebuilt.mk
+++ b/core/soong_cc_prebuilt.mk
@@ -113,7 +113,10 @@
 ifeq ($(LOCAL_CHECK_SAME_VNDK_VARIANTS),true)
   ifeq ($(filter hwaddress address, $(SANITIZE_TARGET)),)
     ifneq ($(CLANG_COVERAGE),true)
-      my_check_same_vndk_variants := true
+        # Do not compare VNDK variant for special cases e.g. coverage builds.
+        ifneq ($(SKIP_VNDK_VARIANTS_CHECK),true)
+            my_check_same_vndk_variants := true
+        endif
     endif
   endif
 endif