Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc18f8c1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d46 am: a61ed55d 

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



Change-Id: I438e0f14237eaa82794d3c47aa534b17b0164e44
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e2ff049 a61ed55d

core/version_util.mk

+7 −10
Original line number Diff line number Diff line
@@ -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))

    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

target/product/gsi/Android.mk

+13 −0
Original line number Diff line number Diff line 
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.

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

# /prebuilts/vndk

ifeq (REL,$(PLATFORM_VERSION_CODENAME))

ifndef UNFROZEN_VNDK

LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/$(PLATFORM_VNDK_VERSION).txt

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)

endif

else # UNFROZEN_VNDK

LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt

endif # UNFROZEN_VNDK

else

LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt

endif