p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Use PLATFORM_VERSION_CODENAME for VNDK version" am: 5281020692 

am: bbbd85a172

Change-Id: Ic1708ba5468e3628314e9e33a11657ba9f7ee87b
This commit is contained in:
Justin Yun 2017-12-21 02:59:24 +00:00 committed by android-build-merger
parent 2b28684175 bbbd85a172
commit fa9d3b129a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/version_defaults.mk
View File

@ -187,17 +187,18 @@ endif
ifndef PLATFORM_VNDK_VERSION ifndef PLATFORM_VNDK_VERSION
# This is the definition of the VNDK version for the current VNDK libraries. # This is the definition of the VNDK version for the current VNDK libraries.
# The version is only available when PLATFORM_VERSION_CODENAME == REL. # The version is only available when PLATFORM_VERSION_CODENAME == REL.
# Otherwise, it will be set to "current". The ABI is allowed to be changed # Otherwise, it will be set to a CODENAME version. The ABI is allowed to be
# only if PLATFORM_VNDK_VERSION == current. Once PLATFORM_VNDK_VERSION is set # changed only before the Android version is released. Once
# to actual version, the ABI for this version will be frozon and emit build # PLATFORM_VNDK_VERSION is set to actual version, the ABI for this version
# errors if any ABI for the VNDK libs are changed. # 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. # 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)) ifeq (REL,$(PLATFORM_VERSION_CODENAME))
PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION) PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION)
else else
PLATFORM_VNDK_VERSION := current PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME)
endif endif
endif endif