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

Commit 22951ce8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add BOARD_GENFS_LABELS_VERSION" into main

parents b69b28a2 16c4e3a1

core/android_soong_config_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ $(call soong_config_set_bool,ANDROID,RELEASE_BOARD_API_LEVEL_FROZEN,$(RELEASE_BO 
$(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_DRMSERVER)

$(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64)

$(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER)

$(call add_soong_config_var,ANDROID,BOARD_GENFS_LABELS_VERSION)



$(call add_soong_config_var,ANDROID,ADDITIONAL_M4DEFS,$(if $(BOARD_SEPOLICY_M4DEFS),$(addprefix -D,$(BOARD_SEPOLICY_M4DEFS))))

core/config.mk

+5 −0
Original line number Diff line number Diff line
@@ -894,6 +894,11 @@ PLATFORM_SEPOLICY_COMPAT_VERSIONS := $(filter-out $(PLATFORM_SEPOLICY_VERSION), 
    PLATFORM_SEPOLICY_COMPAT_VERSIONS \

    PLATFORM_SEPOLICY_VERSION \



BOARD_GENFS_LABELS_VERSION ?= $(BOARD_API_LEVEL)

ifeq ($(call math_gt,$(BOARD_API_LEVEL),$(BOARD_GENFS_LABELS_VERSION)),true)

  $(error BOARD_GENFS_LABELS_VERSION ($(BOARD_GENFS_LABELS_VERSION)) must be greater than or equal to BOARD_API_LEVEL ($(BOARD_API_LEVEL)))

endif



ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)

  ifneq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)

    $(error PRODUCT_USE_DYNAMIC_PARTITIONS must be true when PRODUCT_RETROFIT_DYNAMIC_PARTITIONS \