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

Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION

Browse Source 
Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION if VNDK is
deprecated. BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION should not be
used once VNDK is deprecated with KEEP_VNDK=false

Bug: 316829758
Test: AOSP CF build succeeded
Change-Id: Iead60663bed3653e63e7a444a873cfaea50780b0
This commit is contained in:
Kiyoung Kim
2024-02-05 11:25:25 +09:00
parent dc7efff9f6
commit 1e14cdfd56
8 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/version_util.mk
View File

@@ -157,21 +157,23 @@ ifndef DEFAULT_APP_TARGET_SDK
endif
.KATI_READONLY := DEFAULT_APP_TARGET_SDK
ifndef PLATFORM_VNDK_VERSION
# This is the definition of the VNDK version for the current VNDK libraries.
# With trunk stable, VNDK will not be frozen but deprecated.
# This version will be removed with the VNDK deprecation.
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
ifdef RELEASE_PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION := $(RELEASE_PLATFORM_VNDK_VERSION)
ifeq ($(KEEP_VNDK),true)
ifndef PLATFORM_VNDK_VERSION
# This is the definition of the VNDK version for the current VNDK libraries.
# With trunk stable, VNDK will not be frozen but deprecated.
# This version will be removed with the VNDK deprecation.
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
ifdef RELEASE_PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION := $(RELEASE_PLATFORM_VNDK_VERSION)
else
PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION)
endif
else
PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION)
PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME)
endif
else
PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME)
endif
.KATI_READONLY := PLATFORM_VNDK_VERSION
endif
.KATI_READONLY := PLATFORM_VNDK_VERSION
ifndef PLATFORM_SYSTEMSDK_MIN_VERSION
# This is the oldest version of system SDK that the platform supports. Contrary