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

Commit 8e24afbb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set BOARD_SYSTEMSDK_VERSIONS even if PRODUCT_SHIPPING_API_LEVEL is... 

Merge "Set BOARD_SYSTEMSDK_VERSIONS even if PRODUCT_SHIPPING_API_LEVEL is unset" into main am: 7968bc4f am: fdb1137a am: fb5ded84

Original change: https://android-review.googlesource.com/c/platform/build/+/2897500



Change-Id: I2a3f7dda00babb4cf5744724b60685bbc21c9c64
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7f29bdc fb5ded84

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