From ae5e1b7bb02d2d19c105765aa2f3fb00c66da8c2 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Wed, 25 Oct 2023 09:42:06 +0900 Subject: [PATCH] Deprecate VNDK based on feature flag A new feature flag RELEASE_DEPRECATE_VNDK is added to control VNDK deprecation. Use this value to decide whether VNDK should be deprecated, and keep it overridable with command for now. Bug: 301346137 Test: Checked if aosp_cf_x86_64_phone-trunk_staging is VNDK deprecated Change-Id: Ib9bb48fbfb14d1ab87f939439da4f23e364d1173 --- core/config.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/config.mk b/core/config.mk index c747fd5fb3..9b66e55655 100644 --- a/core/config.mk +++ b/core/config.mk @@ -813,7 +813,11 @@ $(KATI_obsolete_var $(foreach req,$(requirements),$(req)_OVERRIDE) \ requirements := # Set default value of KEEP_VNDK. -KEEP_VNDK ?= true +ifeq ($(RELEASE_DEPRECATE_VNDK),true) + KEEP_VNDK ?= false +else + KEEP_VNDK ?= true +endif # BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED can be true only if early-mount of # partitions is supported. But the early-mount must be supported for full