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

Merge "Install VNDK v35 in the vendor partition" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-10-05 12:28:34 +00:00
committed by Gerrit Code Review
parent 618d848f0d 4a39d20909
commit f4e7e17dc4
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,33 +1,23 @@
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)
##################################################################### #####################################################################
# This is the up-to-date list of vndk libs. # This is the up-to-date list of vndk libs.
# TODO(b/62012285): the lib list should be stored somewhere under LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt
# /prebuilts/vndk UNFROZEN_VNDK :=
ifeq (REL,$(PLATFORM_VERSION_CODENAME)) ifeq (REL,$(PLATFORM_VERSION_CODENAME))
ifndef UNFROZEN_VNDK # Use frozen vndk lib list only if "34 >= PLATFORM_VNDK_VERSION"
LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/$(PLATFORM_VNDK_VERSION).txt ifeq ($(call math_gt_or_eq,34,$(PLATFORM_VNDK_VERSION)),true)
ifeq ($(wildcard $(LATEST_VNDK_LIB_LIST)),) LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/$(PLATFORM_VNDK_VERSION).txt
$(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) ifeq ($(wildcard $(LATEST_VNDK_LIB_LIST)),)
endif $(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)
else # UNFROZEN_VNDK endif
LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt else
endif # UNFROZEN_VNDK UNFROZEN_VNDK := true
else endif
LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt
endif endif
##################################################################### #####################################################################
@@ -198,6 +188,11 @@ LOCAL_REQUIRED_MODULES += \
$(VNDK_USING_CORE_VARIANT_LIBRARIES) \ $(VNDK_USING_CORE_VARIANT_LIBRARIES) \
com.android.vndk.current com.android.vndk.current
# Install VNDK apex on vendor partition if VNDK is unfrozen
ifdef UNFROZEN_VNDK
LOCAL_REQUIRED_MODULES += com.android.vndk.current.on_vendor
endif
LOCAL_ADDITIONAL_DEPENDENCIES += $(call module-built-files,\ LOCAL_ADDITIONAL_DEPENDENCIES += $(call module-built-files,\
$(addsuffix .vendor,$(VNDK_CORE_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES))) $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES)))