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

Commit 4ef5040c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Ensure that BOARD_VNDK_VERSION is current"

parents ae4779e2 2c3289bf

core/binary.mk

+3 −3
Original line number Diff line number Diff line
@@ -112,13 +112,13 @@ ifneq ($(LOCAL_SDK_VERSION)$(LOCAL_USE_VNDK),) 
  # that for the generated libraries. Clip the API level to the minimum where

  # appropriate.

  ifdef LOCAL_USE_VNDK

    my_ndk_api := $(BOARD_VNDK_VERSION)

    my_ndk_api := current

  else

    my_ndk_api := $(LOCAL_SDK_VERSION)

  endif

    ifneq ($(my_ndk_api),current)

      my_ndk_api := $(call math_max,$(my_ndk_api),$(my_min_sdk_version))

    endif

  endif



  my_ndk_api_def := $(my_ndk_api)

  my_ndk_hist_api := $(my_ndk_api)

core/envsetup.mk

+7 −0
Original line number Diff line number Diff line
@@ -254,6 +254,13 @@ ifeq ($(AB_OTA_UPDATER),true) 
  endif

endif



# Check BOARD_VNDK_VERSION

ifdef BOARD_VNDK_VERSION

  ifneq ($(BOARD_VNDK_VERSION),current)

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

  endif

endif



# ---------------------------------------------------------------

# Set up configuration for target machine.

# The following must be set: