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

Commit 32773f7e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Implement BOARD_VNDK_VERSION" am: b21ca579 am: d3a28a36 

Change-Id: I2e88272b67e51ab28cc94da2e558089b905389aa
parents 7a81802e d3a28a36

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
@@ -582,9 +582,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
@@ -176,18 +176,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



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