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

Commit 5998eb3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Define BOARD_API_LEVEL_PROP_OVERRIDE for GRF prop" into main

parents c791de76 0d2730f8

core/config.mk

+0 −6
Original line number Diff line number Diff line
@@ -844,12 +844,6 @@ endif 
.KATI_READONLY := BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES



ifdef PRODUCT_SHIPPING_API_LEVEL

  board_api_level := $(firstword $(BOARD_API_LEVEL) $(BOARD_SHIPPING_API_LEVEL))

  ifneq (,$(board_api_level))

    min_systemsdk_version := $(call math_min,$(board_api_level),$(PRODUCT_SHIPPING_API_LEVEL))

  else

    min_systemsdk_version := $(PRODUCT_SHIPPING_API_LEVEL)

  endif

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

    ifneq ($(BOARD_OTA_FRAMEWORK_VBMETA_VERSION_OVERRIDE),)

      $(error When PRODUCT_SHIPPING_API_LEVEL >= 29, BOARD_OTA_FRAMEWORK_VBMETA_VERSION_OVERRIDE cannot be set)

core/product_config.mk

+6 −1
Original line number Diff line number Diff line
@@ -602,7 +602,12 @@ else 
    # Vendors with GRF must define BOARD_SHIPPING_API_LEVEL for the vendor API level.

    # In this case, the VSR API level is the minimum of the PRODUCT_SHIPPING_API_LEVEL

    # and RELEASE_BOARD_API_LEVEL

    VSR_VENDOR_API_LEVEL := $(call math_min,$(VSR_VENDOR_API_LEVEL),$(RELEASE_BOARD_API_LEVEL))

    board_api_level := $(RELEASE_BOARD_API_LEVEL)

    ifdef BOARD_API_LEVEL_PROP_OVERRIDE

      board_api_level := $(BOARD_API_LEVEL_PROP_OVERRIDE)

    endif

    VSR_VENDOR_API_LEVEL := $(call math_min,$(VSR_VENDOR_API_LEVEL),$(board_api_level))

    board_api_level :=

  endif

endif

.KATI_READONLY := VSR_VENDOR_API_LEVEL

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ $(call add_json_bool, ArtUseReadBarrier, $(call invert_bool,$(fi 
$(call add_json_str,  BtConfigIncludeDir,                $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR))

$(call add_json_list, DeviceKernelHeaders,               $(TARGET_DEVICE_KERNEL_HEADERS) $(TARGET_BOARD_KERNEL_HEADERS) $(TARGET_PRODUCT_KERNEL_HEADERS))

$(call add_json_str,  VendorApiLevel,                    $(BOARD_API_LEVEL))

$(call add_json_str,  VendorApiLevelPropOverride,        $(BOARD_API_LEVEL_PROP_OVERRIDE))

$(call add_json_list, ExtraVndkVersions,                 $(PRODUCT_EXTRA_VNDK_VERSIONS))

$(call add_json_list, DeviceSystemSdkVersions,           $(BOARD_SYSTEMSDK_VERSIONS))

$(call add_json_list, Platform_systemsdk_versions,       $(PLATFORM_SYSTEMSDK_VERSIONS))

core/sysprop_config.mk

+6 −2
Original line number Diff line number Diff line
@@ -92,7 +92,11 @@ endif 
# This must not be altered outside of build system.

ifdef BOARD_API_LEVEL

  ADDITIONAL_VENDOR_PROPERTIES += \

    ro.board.api_level=$(BOARD_API_LEVEL)

    ro.board.api_level?=$(BOARD_API_LEVEL)

  ifdef BOARD_API_LEVEL_PROP_OVERRIDE

    ADDITIONAL_VENDOR_PROPERTIES += \

      ro.board.api_level=$(BOARD_API_LEVEL_PROP_OVERRIDE)

  endif

endif

# RELEASE_BOARD_API_LEVEL_FROZEN is true when the vendor API surface is frozen.

ifdef RELEASE_BOARD_API_LEVEL_FROZEN