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

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

Merge "Move vndk apex to the vendor partition for in-development builds" into main am: 32500b00 

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



Change-Id: Ifd339125bcff6b07ddbf06653767388500c35097
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7ef93bb 32500b00

target/product/gsi/Android.mk

+2 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ INTERNAL_VNDK_LIB_LIST := $(SOONG_VNDK_LIBRARIES_FILE) 
#####################################################################

# This is the up-to-date list of vndk libs.

LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt

UNFROZEN_VNDK :=

UNFROZEN_VNDK := true

ifeq (REL,$(PLATFORM_VERSION_CODENAME))

    # Use frozen vndk lib list only if "34 >= PLATFORM_VNDK_VERSION"

    ifeq ($(call math_gt_or_eq,34,$(PLATFORM_VNDK_VERSION)),true)
@@ -15,8 +15,7 @@ ifeq (REL,$(PLATFORM_VERSION_CODENAME)) 
        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 := true

        UNFROZEN_VNDK :=

    endif

endif