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

Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635 am: a61ed55d48

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I438e0f14237eaa82794d3c47aa534b17b0164e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-09-14 01:37:03 +00:00
committed by Automerger Merge Worker
parent 0e2ff049b5 a61ed55d48
commit bc18f8c151
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/version_util.mk
View File

@@ -169,17 +169,14 @@ endif
ifndef PLATFORM_VNDK_VERSION
# This is the definition of the VNDK version for the current VNDK libraries.
# The version is only available when PLATFORM_VERSION_CODENAME == REL.
# Otherwise, it will be set to a CODENAME version. The ABI is allowed to be
# changed only before the Android version is released. Once
# PLATFORM_VNDK_VERSION is set to actual version, the ABI for this version
# will be frozon and emit build errors if any ABI for the VNDK libs are
# changed.
# After that the snapshot of the VNDK with this version will be generated.
#
# The VNDK version follows PLATFORM_SDK_VERSION.
# With trunk stable, VNDK will not be frozen but deprecated.
# This version will be removed with the VNDK deprecation.
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION)
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_VERSION_CODENAME)
endif