diff --git a/core/Makefile b/core/Makefile index 7975d3a66c..d4a4ee10b9 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3937,6 +3937,9 @@ $(warning No INSTALLED_KERNEL_TARGET is defined when PRODUCT_OTA_ENFORCE_VINTF_K or (2) extracting kernel configuration and defining BOARD_KERNEL_CONFIG_FILE and \ BOARD_KERNEL_VERSION manually; or (3) unsetting PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS \ manually.) +# Clear their values to indicate that these two files does not exist. +BUILT_KERNEL_CONFIGS_FILE := +BUILT_KERNEL_VERSION_FILE := else # Tools for decompression that is not in PATH. @@ -3981,8 +3984,10 @@ check_vintf_compatible_args := check_vintf_compatible_deps := $(check_vintf_common_srcs) ifeq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),true) +ifneq (,$(BUILT_KERNEL_VERSION_FILE)$(BUILT_KERNEL_CONFIGS_FILE)) check_vintf_compatible_args += --kernel $(BUILT_KERNEL_VERSION_FILE):$(BUILT_KERNEL_CONFIGS_FILE) check_vintf_compatible_deps += $(BUILT_KERNEL_CONFIGS_FILE) $(BUILT_KERNEL_VERSION_FILE) +endif # BUILT_KERNEL_VERSION_FILE != "" || BUILT_KERNEL_CONFIGS_FILE != "" endif # PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS check_vintf_compatible_args += \