From 37472997836238ac89fae2d9bf35afe0266c5204 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Fri, 25 Aug 2023 13:58:27 +0900 Subject: [PATCH] Do not set ro.(product.)vndk.version if VNDK is deprecated ro.(product.)vndk.version should be empty when the VNDK is deprecated. This change skips property set up when KEEP_VNDK flag is false. Device can check if VNDK is deprecated with ro.(product.)vndk.version property. Bug: 290159430 Test: aosp_cf_x86_64_phone build and boot succeeded. Change-Id: Ia02fb33137c8df456fda87b5b769cfb940349747 --- core/main.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/main.mk b/core/main.mk index 12b7bd0105..be9194cc47 100644 --- a/core/main.mk +++ b/core/main.mk @@ -213,11 +213,13 @@ ADDITIONAL_SYSTEM_PROPERTIES += ro.postinstall.fstab.prefix=/system # property_overrides_split_enabled is true. Otherwise it will be installed in # /system/build.prop ifdef BOARD_VNDK_VERSION + ifneq ($(KEEP_VNDK),false) ifeq ($(BOARD_VNDK_VERSION),current) ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION) else ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(BOARD_VNDK_VERSION) endif + endif # TODO(b/290159430): ro.vndk.deprecate is a temporal variable for deprecating VNDK. # This variable will be removed once ro.vndk.version can be removed. @@ -330,12 +332,14 @@ endif # modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value # is "current", use PLATFORM_VNDK_VERSION. ifdef PRODUCT_PRODUCT_VNDK_VERSION +ifneq ($(KEEP_VNDK),false) ifeq ($(PRODUCT_PRODUCT_VNDK_VERSION),current) ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PLATFORM_VNDK_VERSION) else ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PRODUCT_PRODUCT_VNDK_VERSION) endif endif +endif ADDITIONAL_PRODUCT_PROPERTIES += ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS)