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

Merge "BOARD_VNDK_VERSION always by default"

Browse Source
This commit is contained in:
Steven Moreland
2022-08-17 18:43:37 +00:00
committed by Gerrit Code Review
parent 065afd42e8 46a6081c43
commit 34570d33f4
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/config.mk
View File

@@ -712,27 +712,11 @@ ifeq ($(PRODUCT_FULL_TREBLE),true)
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED ?= true BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED ?= true
endif endif
# If PRODUCT_USE_VNDK is true and BOARD_VNDK_VERSION is not defined yet, # Starting in Android U, non-VNDK devices not supported
# BOARD_VNDK_VERSION will be set to "current" as default. ifndef BOARD_VNDK_VERSION
# PRODUCT_USE_VNDK will be true in Android-P or later launching devices. BOARD_VNDK_VERSION := current
PRODUCT_USE_VNDK := false
ifneq ($(PRODUCT_USE_VNDK_OVERRIDE),)
PRODUCT_USE_VNDK := $(PRODUCT_USE_VNDK_OVERRIDE)
else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),)
# No shipping level defined
else ifeq ($(call math_gt,$(PRODUCT_SHIPPING_API_LEVEL),27),true)
PRODUCT_USE_VNDK := $(PRODUCT_FULL_TREBLE)
endif endif
ifeq ($(PRODUCT_USE_VNDK),true)
ifndef BOARD_VNDK_VERSION
BOARD_VNDK_VERSION := current
endif
endif
$(KATI_obsolete_var PRODUCT_USE_VNDK,Use BOARD_VNDK_VERSION instead)
$(KATI_obsolete_var PRODUCT_USE_VNDK_OVERRIDE,Use BOARD_VNDK_VERSION instead)
ifdef PRODUCT_PRODUCT_VNDK_VERSION ifdef PRODUCT_PRODUCT_VNDK_VERSION
ifndef BOARD_VNDK_VERSION ifndef BOARD_VNDK_VERSION
# VNDK for product partition is not available unless BOARD_VNDK_VERSION # VNDK for product partition is not available unless BOARD_VNDK_VERSION