From 7ae3ce79aa984a0a1119680041ef4bbdcfb30b53 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Mon, 29 Jun 2020 11:06:16 +0900 Subject: [PATCH] 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/config.mk | 1 + core/main.mk | 6 ------ core/soong_cc_prebuilt.mk | 5 ++++- core/soong_config.mk | 1 - core/tasks/vndk.mk | 7 ------- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/core/config.mk b/core/config.mk index b928af088..d701d4d8b 100644 --- a/core/config.mk +++ b/core/config.mk @@ -153,6 +153,7 @@ $(KATI_obsolete_var PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_WHITELIST,Us $(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 diff --git a/core/main.mk b/core/main.mk index f718c9d4b..0bd2c5321 100644 --- a/core/main.mk +++ b/core/main.mk @@ -235,12 +235,6 @@ ifdef BOARD_VNDK_VERSION 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. diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk index 986609b50..c9b742a7b 100644 --- a/core/soong_cc_prebuilt.mk +++ b/core/soong_cc_prebuilt.mk @@ -113,7 +113,10 @@ my_check_same_vndk_variants := 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 diff --git a/core/soong_config.mk b/core/soong_config.mk index b826024e3..81dbc2328 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -129,7 +129,6 @@ $(call add_json_str, DeviceVndkVersion, $(BOARD_VNDK_VERSION)) $(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)))) diff --git a/core/tasks/vndk.mk b/core/tasks/vndk.mk index a2973b4c8..ebe9bd473 100644 --- a/core/tasks/vndk.mk +++ b/core/tasks/vndk.mk @@ -20,18 +20,11 @@ ifeq ($(BOARD_VNDK_VERSION),current) # 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