StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define PRODUCT_PRODUCT_VNDK_VERSION as current by default

Browse Source 
It has been mandatory since Android 11 (rvc) launching devices. Now we
can enable the product variants by default to all devices.

Bug: 300371698
Test: TH
Change-Id: I6b2d2e8e105ca35c38db8132486b1cb3bdbab40f
This commit is contained in:
Justin Yun
2023-09-14 16:18:33 +09:00
parent 1e042d4635
commit 9ccc880aa6
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/product_config.mk
View File

@@ -546,30 +546,12 @@ endif
$(KATI_obsolete_var OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE,Use PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE instead) $(KATI_obsolete_var OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE,Use PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE instead)
# If build command defines PRODUCT_USE_PRODUCT_VNDK_OVERRIDE as `false`, # From Android V, Define PRODUCT_PRODUCT_VNDK_VERSION as current by default.
# PRODUCT_PRODUCT_VNDK_VERSION will not be defined automatically. # This is required to make all devices have product variants.
# PRODUCT_USE_PRODUCT_VNDK_OVERRIDE can be used for testing only. ifndef PRODUCT_PRODUCT_VNDK_VERSION
PRODUCT_USE_PRODUCT_VNDK := false PRODUCT_PRODUCT_VNDK_VERSION := current
ifneq ($(PRODUCT_USE_PRODUCT_VNDK_OVERRIDE),)
PRODUCT_USE_PRODUCT_VNDK := $(PRODUCT_USE_PRODUCT_VNDK_OVERRIDE)
else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),)
# No shipping level defined. Enforce the product interface by default.
PRODUCT_USE_PRODUCT_VNDK := true
else ifeq ($(call math_gt,$(PRODUCT_SHIPPING_API_LEVEL),29),true)
# Enforce product interface for VNDK if PRODUCT_SHIPPING_API_LEVEL is greater
# than 29.
PRODUCT_USE_PRODUCT_VNDK := true
endif endif
ifeq ($(PRODUCT_USE_PRODUCT_VNDK),true)
ifndef PRODUCT_PRODUCT_VNDK_VERSION
PRODUCT_PRODUCT_VNDK_VERSION := current
endif
endif
$(KATI_obsolete_var PRODUCT_USE_PRODUCT_VNDK,Use PRODUCT_PRODUCT_VNDK_VERSION instead)
$(KATI_obsolete_var PRODUCT_USE_PRODUCT_VNDK_OVERRIDE,Use PRODUCT_PRODUCT_VNDK_VERSION instead)
ifdef PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS ifdef PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS
$(error PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS is deprecated, consider using RRO for \ $(error PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS is deprecated, consider using RRO for \
$(PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS)) $(PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS))