Use PLATFORM_VERSION_CODENAME for VNDK version
Before Android version is released, we may use
PLATFORM_VERSION_CODENAME for PLATFORM_VNDK_VERSION to add version
suffix to VNDK directories.
Bug: 70584135
Test: Test youtube and RS apps
Change-Id: Ie788544740a5257232abc2c9acbce64749d15602
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 32d9003..f6bc76b 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -187,17 +187,18 @@
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 "current". The ABI is allowed to be changed
- # only if PLATFORM_VNDK_VERSION == current. 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.
+ # 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 version follows PLATFORM_SDK_VERSION.
+ # The VNDK version follows PLATFORM_SDK_VERSION.
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION)
else
- PLATFORM_VNDK_VERSION := current
+ PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME)
endif
endif