commit c8343a3f0e1552bfa2d744adfdfbee2907464348
author Kiyoung Kim <kiyoungkim@google.com> Tue Jul 28 00:36:10 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 28 00:36:10 2020 +0000
tree dfa46551939b61de2449fa82f75b0d60b39ee0bc
parent a5fb54f6ebafe1f42c4cea7ecaf84caca6629eda
parent 7ae3ce79aa984a0a1119680041ef4bbdcfb30b53

Merge "Deprecate VNDK-Lite"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 7244b9f..a35b718 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -153,6 +153,7 @@
 $(KATI_obsolete_var PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST,Use PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST.)
 $(KATI_obsolete_var COVERAGE_PATHS,Use NATIVE_COVERAGE_PATHS instead)
 $(KATI_obsolete_var COVERAGE_EXCLUDE_PATHS,Use NATIVE_COVERAGE_EXCLUDE_PATHS instead)
+$(KATI_obsolete_var BOARD_VNDK_RUNTIME_DISABLE,VNDK-Lite is no longer supported.)
 
 # Used to force goals to build.  Only use for conditionally defined goals.
 .PHONY: FORCE

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 20b50cd..90c4cc4 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -232,12 +232,6 @@
   else
     ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(BOARD_VNDK_VERSION)
   endif
-  ifdef BOARD_VNDK_RUNTIME_DISABLE
-    ADDITIONAL_VENDOR_PROPERTIES += ro.vndk.lite=true
-  endif
-else
-  ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION)
-  ADDITIONAL_VENDOR_PROPERTIES += ro.vndk.lite=true
 endif
 
 # Add cpu properties for bionic and ART.

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

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index b826024..81dbc23 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -129,7 +129,6 @@
 $(call add_json_str,  Platform_vndk_version,             $(PLATFORM_VNDK_VERSION))
 $(call add_json_str,  ProductVndkVersion,                $(PRODUCT_PRODUCT_VNDK_VERSION))
 $(call add_json_list, ExtraVndkVersions,                 $(PRODUCT_EXTRA_VNDK_VERSIONS))
-$(call add_json_bool, BoardVndkRuntimeDisable,           $(BOARD_VNDK_RUNTIME_DISABLE))
 $(call add_json_list, DeviceSystemSdkVersions,           $(BOARD_SYSTEMSDK_VERSIONS))
 $(call add_json_list, Platform_systemsdk_versions,       $(PLATFORM_SYSTEMSDK_VERSIONS))
 $(call add_json_bool, Malloc_not_svelte,                 $(call invert_bool,$(filter true,$(MALLOC_SVELTE))))

core/tasks/vndk.mk

diff --git a/core/tasks/vndk.mk b/core/tasks/vndk.mk
index a2973b4..ebe9bd4 100644
--- a/core/tasks/vndk.mk
+++ b/core/tasks/vndk.mk
@@ -20,18 +20,11 @@
 # PLATFORM_VNDK_VERSION must be set.
 ifneq (,$(PLATFORM_VNDK_VERSION))
 
-# BOARD_VNDK_RUNTIME_DISABLE must not be set to 'true'.
-ifneq ($(BOARD_VNDK_RUNTIME_DISABLE),true)
-
 .PHONY: vndk
 vndk: $(SOONG_VNDK_SNAPSHOT_ZIP)
 
 $(call dist-for-goals, vndk, $(SOONG_VNDK_SNAPSHOT_ZIP))
 
-else # BOARD_VNDK_RUNTIME_DISABLE is set to 'true'
-error_msg := "CANNOT generate VNDK snapshot. BOARD_VNDK_RUNTIME_DISABLE must not be set to 'true'."
-endif # BOARD_VNDK_RUNTIME_DISABLE
-
 else # PLATFORM_VNDK_VERSION is NOT set
 error_msg := "CANNOT generate VNDK snapshot. PLATFORM_VNDK_VERSION must be set."
 endif # PLATFORM_VNDK_VERSION