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

Commit cb6923e4 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS: allow inheritance" 

am: b906ebb3

Change-Id: I439ef709e9f997d01cc11d797346a7c0a44d88ed
parents 34f75d3c b906ebb3

core/config.mk

+1 −6
Original line number Original line Diff line number Diff line
@@ -923,12 +923,7 @@ PLATFORM_SEPOLICY_COMPAT_VERSIONS := \ 
    PLATFORM_SEPOLICY_VERSION \

    PLATFORM_SEPOLICY_VERSION \

    TOT_SEPOLICY_VERSION \

    TOT_SEPOLICY_VERSION \





# If true, kernel configuration requirements are present in OTA package (and will be enforced

ifeq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),)

# during OTA). Otherwise, kernel configuration requirements are enforced in VTS.

# Devices that checks the running kernel (instead of the kernel in OTA package) should not

# set this variable to prevent OTA failures.

ifndef PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS

  PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS :=

  ifdef PRODUCT_SHIPPING_API_LEVEL

  ifdef PRODUCT_SHIPPING_API_LEVEL

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

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

      PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true

      PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true

core/product.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -211,6 +211,7 @@ _product_var_list := \ 
    PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION \

    PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION \

    PRODUCT_USE_DYNAMIC_PARTITIONS \

    PRODUCT_USE_DYNAMIC_PARTITIONS \

    PRODUCT_RETROFIT_DYNAMIC_PARTITIONS \

    PRODUCT_RETROFIT_DYNAMIC_PARTITIONS \

    PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS \





define dump-product

define dump-product

$(info ==== $(1) ====)\

$(info ==== $(1) ====)\

core/product_config.mk

+7 −0
Original line number Original line Diff line number Diff line
@@ -544,3 +544,10 @@ PRODUCT_BUILD_SUPER_PARTITION := $(or \ 
PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION := \

PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION))

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION))

.KATI_READONLY := PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION

.KATI_READONLY := PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION



# If set, kernel configuration requirements are present in OTA package (and will be enforced

# during OTA). Otherwise, kernel configuration requirements are enforced in VTS.

# Devices that checks the running kernel (instead of the kernel in OTA package) should not

# set this variable to prevent OTA failures.

PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS))