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

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

Change-Id: I9eec8eed73fe4f3e816765ef59cff2e612f2c679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-09-14 00:43:18 +00:00
committed by Automerger Merge Worker
parent a1e610a819 1e042d4635
commit a61ed55d48
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 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. # With trunk stable, VNDK will not be frozen but deprecated.
# Otherwise, it will be set to a CODENAME version. The ABI is allowed to be # This version will be removed with the VNDK deprecation.
# 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.
ifeq (REL,$(PLATFORM_VERSION_CODENAME)) 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 else
PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME) PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME)
endif endif

13
target/product/gsi/Android.mk
View File

@@ -1,5 +1,14 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
# VNDK will not be frozen if the PLATFORM_VNDK_VERSION is a codename or greater than 34
ifeq ($(call math_is_number,$(PLATFORM_VNDK_VERSION)),)
UNFROZEN_VNDK := true
else
ifeq ($(call math_gt,$(PLATFORM_VNDK_VERSION),34),true)
UNFROZEN_VNDK := true
endif
endif
##################################################################### #####################################################################
# list of vndk libraries from the source code. # list of vndk libraries from the source code.
INTERNAL_VNDK_LIB_LIST := $(SOONG_VNDK_LIBRARIES_FILE) INTERNAL_VNDK_LIB_LIST := $(SOONG_VNDK_LIBRARIES_FILE)
@@ -9,10 +18,14 @@ INTERNAL_VNDK_LIB_LIST := $(SOONG_VNDK_LIBRARIES_FILE)
# TODO(b/62012285): the lib list should be stored somewhere under # TODO(b/62012285): the lib list should be stored somewhere under
# /prebuilts/vndk # /prebuilts/vndk
ifeq (REL,$(PLATFORM_VERSION_CODENAME)) ifeq (REL,$(PLATFORM_VERSION_CODENAME))
ifndef UNFROZEN_VNDK
LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/$(PLATFORM_VNDK_VERSION).txt LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/$(PLATFORM_VNDK_VERSION).txt
ifeq ($(wildcard $(LATEST_VNDK_LIB_LIST)),) ifeq ($(wildcard $(LATEST_VNDK_LIB_LIST)),)
$(error $(LATEST_VNDK_LIB_LIST) file not found. Please copy "$(LOCAL_PATH)/current.txt" to "$(LATEST_VNDK_LIB_LIST)" and commit a CL for release branch) $(error $(LATEST_VNDK_LIB_LIST) file not found. Please copy "$(LOCAL_PATH)/current.txt" to "$(LATEST_VNDK_LIB_LIST)" and commit a CL for release branch)
endif endif
else # UNFROZEN_VNDK
LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt
endif # UNFROZEN_VNDK
else else
LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt
endif endif