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

Commit f0cec69d authored by Inseob Kim's avatar Inseob Kim
Browse files

Implement BOARD_VNDK_VERSION 

This allows BOARD_VNDK_VERSION to be set to old versions. With VNDK
snapshot and vendor snapshot installed, newer system and older vendor
image can be built in the same time.

Bug: 65377115
Test: 1) VNDK_SNAPSHOT_BUILD_ARTIFACTS=true m dist vndk vendor-snapshot
Test: 2) install snapshot under source tree
Test: 3) set BOARD_VNDK_VERSION and boot cuttlefish
Change-Id: Ic5fefc8bcb866584b27f021a429cb6670a2e3048
parent c465e204

core/binary.mk

+3 −0
Original line number Diff line number Diff line
@@ -299,6 +299,9 @@ ifneq ($(LOCAL_USE_VNDK),) 
    # If PLATFORM_VNDK_VERSION has a CODENAME, it will return

    # __ANDROID_API_FUTURE__.

    my_api_level := $(call codename-or-sdk-to-sdk,$(PLATFORM_VNDK_VERSION))

  else

    # Build with current BOARD_VNDK_VERSION.

    my_api_level := $(call codename-or-sdk-to-sdk,$(BOARD_VNDK_VERSION))

  endif

  my_cflags += -D__ANDROID_VNDK__

endif

core/board_config.mk

+1 −2
Original line number Diff line number Diff line
@@ -580,9 +580,8 @@ endef 


ifdef BOARD_VNDK_VERSION

  ifneq ($(BOARD_VNDK_VERSION),current)

    $(error BOARD_VNDK_VERSION: Only "current" is implemented)

    $(call check_vndk_version,$(BOARD_VNDK_VERSION))

  endif



  TARGET_VENDOR_TEST_SUFFIX := /vendor

else

  TARGET_VENDOR_TEST_SUFFIX :=

target/product/gsi/Android.mk

+8 −2
Original line number Diff line number Diff line
@@ -175,18 +175,24 @@ ifneq ($(TARGET_IS_64_BIT),true) 
_binder32 := _binder32

endif

endif

_vndk_versions := $(PRODUCT_EXTRA_VNDK_VERSIONS)

ifneq ($(BOARD_VNDK_VERSION),current)

	_vndk_versions += $(BOARD_VNDK_VERSION)

endif

# Phony targets are installed for **.libraries.txt files.

# TODO(b/141450808): remove following VNDK phony targets when **.libraries.txt files are provided by apexes.

LOCAL_REQUIRED_MODULES := \

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

    $(foreach vndk_ver,$(_vndk_versions),vndk_v$(vndk_ver)_$(TARGET_ARCH)$(_binder32))

_binder32 :=

include $(BUILD_PHONY_PACKAGE)



include $(CLEAR_VARS)

LOCAL_MODULE := vndk_apex_snapshot_package

LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver))

LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(_vndk_versions),com.android.vndk.v$(vndk_ver))

include $(BUILD_PHONY_PACKAGE)



_vndk_versions :=



endif # BOARD_VNDK_VERSION is set



#####################################################################