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

Commit 0284ba29 authored by Jiyong Park's avatar Jiyong Park
Browse files

Set BOARD_SYSTEMSDK_VERSIONS even if PRODUCT_SHIPPING_API_LEVEL is unset 

Previously, we checked if PRODUCT_SHIPPING_API_LEVEL >= 28, but that no
longer is needed because upgrading from 29 to 35 is not expected. All
devices running Android V are expected to be shipped after 28.

Furthermore, this fixes non-device targets (like sdk) where
PRODUCT_SHIPPING_API_LEVEL is unset.

Bug: 318634417
Test: build with sdk target
Change-Id: I8f8337fb76312334777e621ae5870d953167ad49
parent e3c27884

core/config.mk

+4 −8
Original line number Diff line number Diff line
@@ -831,16 +831,12 @@ endif 
# Set BOARD_SYSTEMSDK_VERSIONS to the latest SystemSDK version starting from P-launching

# devices if unset.

ifndef BOARD_SYSTEMSDK_VERSIONS

  ifdef PRODUCT_SHIPPING_API_LEVEL

  ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),28),)

  ifeq (REL,$(PLATFORM_VERSION_CODENAME))

    BOARD_SYSTEMSDK_VERSIONS := $(PLATFORM_SDK_VERSION)

  else

    BOARD_SYSTEMSDK_VERSIONS := $(PLATFORM_VERSION_CODENAME)

  endif

endif

  endif

endif



ifndef BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES

  BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES := current