common: Fix 5_15 family components condition

Change-Id: Ie7f2f0eaf664db373720dbc1a643755011f7920b
Signed-off-by: chrisl7 <wandersonrodriguesf1@gmail.com>
This commit is contained in:
chrisl7 2023-06-16 23:05:44 -04:00 committed by Adithya R
parent 39dfc7241b
commit c8c0d6941f
4 changed files with 7 additions and 7 deletions

View File

@ -79,7 +79,7 @@ ifneq (,$(filter dsprpcd, $(TARGET_COMMON_QTI_COMPONENTS)))
include $(QCOM_COMMON_PATH)/vendor/dsprpcd/qti-dsprpcd.mk include $(QCOM_COMMON_PATH)/vendor/dsprpcd/qti-dsprpcd.mk
endif endif
ifeq ($(call is-board-platform-in-list,$(5_10_FAMILY)),true) ifeq ($(call is-board-platform-in-list,$(5_10_FAMILY) $(5_15_FAMILY)),true)
include $(QCOM_COMMON_PATH)/dlkm/qti-dlkm.mk include $(QCOM_COMMON_PATH)/dlkm/qti-dlkm.mk
endif endif
@ -131,7 +131,7 @@ ifneq (,$(filter perf, $(TARGET_COMMON_QTI_COMPONENTS)))
endif endif
ifneq (,$(filter qseecomd, $(TARGET_COMMON_QTI_COMPONENTS))) ifneq (,$(filter qseecomd, $(TARGET_COMMON_QTI_COMPONENTS)))
ifeq ($(call is-board-platform-in-list,$(5_4_FAMILY) $(5_10_FAMILY)),true) ifeq ($(call is-board-platform-in-list,$(5_4_FAMILY) $(5_10_FAMILY) $(5_15_FAMILY)),true)
TARGET_QSEECOMD_COMPONENT_VARIANT ?= qseecomd TARGET_QSEECOMD_COMPONENT_VARIANT ?= qseecomd
else else
TARGET_QSEECOMD_COMPONENT_VARIANT ?= qseecomd-legacy TARGET_QSEECOMD_COMPONENT_VARIANT ?= qseecomd-legacy

View File

@ -57,12 +57,12 @@ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.qspm.enable=true \ ro.vendor.qspm.enable=true \
vendor.power.pasr.enabled=true vendor.power.pasr.enabled=true
ifeq ($(call is-board-platform-in-list, kalama),true) ifeq ($(TARGET_KERNEL_VERSION),5.15)
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
vendor.perf.framepacing.enable=1 vendor.perf.framepacing.enable=1
endif endif
ifeq ($(call is-board-platform-in-list, kalama kona lahaina parrot taro),true) ifneq (,$(filter 5.10 5.15, $(TARGET_KERNEL_VERSION)))
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.beluga.p=0x3 \ ro.vendor.beluga.p=0x3 \
ro.vendor.beluga.c=0x4800 \ ro.vendor.beluga.c=0x4800 \

View File

@ -19,7 +19,7 @@ PRODUCT_SOONG_NAMESPACES += \
$(call inherit-product, vendor/qcom/opensource/dataservices/dataservices_vendor_product.mk) $(call inherit-product, vendor/qcom/opensource/dataservices/dataservices_vendor_product.mk)
# IPACM # IPACM
ifneq (,$(filter 5.10, $(TARGET_KERNEL_VERSION))) ifneq (,$(filter 5.10 5.15, $(TARGET_KERNEL_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/data-ipa-cfg-mgr PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/data-ipa-cfg-mgr
$(call inherit-product, vendor/qcom/opensource/data-ipa-cfg-mgr/ipacm_vendor_product.mk) $(call inherit-product, vendor/qcom/opensource/data-ipa-cfg-mgr/ipacm_vendor_product.mk)
else else

View File

@ -18,11 +18,11 @@ PRODUCT_SOONG_NAMESPACES += \
# Inherit from the USB product definition. # Inherit from the USB product definition.
$(call inherit-product, vendor/qcom/opensource/usb/vendor_product.mk) $(call inherit-product, vendor/qcom/opensource/usb/vendor_product.mk)
ifneq (,$(filter 5.4 5.10, $(TARGET_KERNEL_VERSION))) ifneq (,$(filter 5.4 5.10 5.15, $(TARGET_KERNEL_VERSION)))
TARGET_HAS_DIAG_ROUTER := true TARGET_HAS_DIAG_ROUTER := true
endif endif
ifeq (,$(filter 4.19 5.4 5.10, $(TARGET_KERNEL_VERSION))) ifeq (,$(filter 4.19 5.4 5.10 5.15, $(TARGET_KERNEL_VERSION)))
PRODUCT_PACKAGES += android.hardware.usb@1.0-service PRODUCT_PACKAGES += android.hardware.usb@1.0-service
endif endif