diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-05 13:00:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-05 13:00:33 +0000 |
| commit | cbceed2231984c240f27989d2a7160eb69e6ee6f (patch) | |
| tree | f6c9c300b9c821373eed178e46ac39b7250c90f5 | |
| parent | 2ea0f6db1ff268947bc67adde98bd5475856d32a (diff) | |
| parent | f4e7e17dc4b0f3e0d9bb3edc7cd3bb788f2149e6 (diff) | |
| download | build-tmp_amf_298295554.tar.gz | |
Merge "Install VNDK v35 in the vendor partition" into main am: f4e7e17dc4tmp_amf_298295554
Original change: https://android-review.googlesource.com/c/platform/build/+/2774164
Change-Id: I8949364d94b6263f06522992f6790c22a8ec6a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | target/product/gsi/Android.mk | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index 70ee78db75..655a66622f 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -1,33 +1,23 @@ 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) ##################################################################### # This is the up-to-date list of vndk libs. -# 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 +UNFROZEN_VNDK := +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) + 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 := true + endif endif ##################################################################### @@ -198,6 +188,11 @@ LOCAL_REQUIRED_MODULES += \ $(VNDK_USING_CORE_VARIANT_LIBRARIES) \ 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,\ $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES))) |