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

Commit 269dd013 authored by Anton Hansson's avatar Anton Hansson
Browse files

Move default setting of a product variable 

Should be in product_config.mk, before the variables are readonly'd, or
the default will fail to work.

Bug: 131576555
Test: set PRODUCT_SHIPPING_API_LEVEL := 29 in mainline_arm64.mk && lunch
Change-Id: I25faee7ec0a3fff17e1d08b834d868834effda36
parent 738b9963

core/config.mk

+0 −9
Original line number Diff line number Diff line
@@ -813,15 +813,6 @@ PLATFORM_SEPOLICY_COMPAT_VERSIONS := \ 
    PLATFORM_SEPOLICY_VERSION \

    TOT_SEPOLICY_VERSION \



ifeq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),)

  ifdef PRODUCT_SHIPPING_API_LEVEL

    ifeq (true,$(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),29))

      PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true

    endif

  endif

endif

.KATI_READONLY := PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS



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 \

core/product_config.mk

+8 −0
Original line number Diff line number Diff line
@@ -376,6 +376,14 @@ ifndef PRODUCT_BUILD_SUPER_PARTITION 
  PRODUCT_BUILD_SUPER_PARTITION := $(PRODUCT_USE_DYNAMIC_PARTITIONS)

endif



ifeq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),)

  ifdef PRODUCT_SHIPPING_API_LEVEL

    ifeq (true,$(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),29))

      PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true

    endif

  endif

endif



define product-overrides-config

$$(foreach rule,$$(PRODUCT_$(1)_OVERRIDES),\

    $$(if $$(filter 2,$$(words $$(subst :,$$(space),$$(rule)))),,\