StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I179f43bb0c71606a37c97119066e17fe6d5211ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-10-31 04:52:37 +00:00
committed by Automerger Merge Worker
parent 661e277345 7fb57226ce
commit 54d387f791
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ INTERNAL_VNDK_LIB_LIST := $(SOONG_VNDK_LIBRARIES_FILE)
##################################################################### #####################################################################
# This is the up-to-date list of vndk libs. # This is the up-to-date list of vndk libs.
LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt
UNFROZEN_VNDK := UNFROZEN_VNDK := true
ifeq (REL,$(PLATFORM_VERSION_CODENAME)) ifeq (REL,$(PLATFORM_VERSION_CODENAME))
# Use frozen vndk lib list only if "34 >= PLATFORM_VNDK_VERSION" # Use frozen vndk lib list only if "34 >= PLATFORM_VNDK_VERSION"
ifeq ($(call math_gt_or_eq,34,$(PLATFORM_VNDK_VERSION)),true) 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)),) 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 :=
UNFROZEN_VNDK := true
endif endif
endif endif