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

Commit 992ef6c6 authored by Justin Yun's avatar Justin Yun
Browse files

Separate vndk_snapshot_package from vndk_package 

vndk_package only includes current VNDK builds without snapshots.
The snapshots will be included by PRODUCT_EXTRA_VNDK_VERSIONS
regardless of vndk_package in PRODUCT_PACKAGES.

Bug: 71609233
Test: Generate snapshot files and include the version in
      PRODUCT_EXTRA_VNDK_VERSIONS. Check if snapshots are installed.

Change-Id: If788af2f7773dd50b8b9ceb1957b8e54fde9ca9f
parent 13f228eb

target/product/core_minimal.mk

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ PRODUCT_PACKAGES += \ 
    telephony-common \

    uiautomator \

    uncrypt \

    vndk_snapshot_package \

    voip-common \

    webview \

    webview_zygote \

target/product/vndk/Android.mk

+3 −10
Original line number Diff line number Diff line
@@ -77,26 +77,19 @@ endif 
	@chmod a+x $@



include $(CLEAR_VARS)

LOCAL_MODULE := vndk_current

LOCAL_MODULE := vndk_package

LOCAL_REQUIRED_MODULES := \

    $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \

    $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \

    $(LLNDK_LIBRARIES) \

    llndk.libraries.txt \

    vndksp.libraries.txt



include $(BUILD_PHONY_PACKAGE)



include $(CLEAR_VARS)

LOCAL_MODULE := vndk_package

ifeq (current,$(BOARD_VNDK_VERSION))

LOCAL_MODULE := vndk_snapshot_package

LOCAL_REQUIRED_MODULES := \

    vndk_current

else

LOCAL_REQUIRED_MODULES := \

    vndk_v$(BOARD_VNDK_VERSION)_$(TARGET_ARCH)

endif

LOCAL_REQUIRED_MODULES += \

    $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver)_$(TARGET_ARCH))

include $(BUILD_PHONY_PACKAGE)



endif # BOARD_VNDK_VERSION is set