vendor: Flip the kernel version check

- Consider futureproofing

Change-Id: Icc9e6f471e5cc85de3772fbafaf0efb860aa91cd
Signed-off-by: Omkar Chandorkar <gotenksIN@aospa.co>
This commit is contained in:
Omkar Chandorkar 2024-09-10 21:51:51 +09:00
parent 4898502afe
commit d73cd4eef1
No known key found for this signature in database
5 changed files with 22 additions and 22 deletions

View File

@ -85,16 +85,16 @@ ifneq (,$(filter dsprpcd, $(TARGET_COMMON_QTI_COMPONENTS)))
include $(QCOM_COMMON_PATH)/vendor/dsprpcd/qti-dsprpcd.mk
endif
ifneq (,$(filter 5.10 5.15, $(TARGET_KERNEL_VERSION)))
ifeq (,$(filter 4.4 4.9 4.14 4.19 5.4, $(TARGET_KERNEL_VERSION)))
include $(QCOM_COMMON_PATH)/dlkm/qti-dlkm.mk
endif
ifneq (,$(filter gps, $(TARGET_COMMON_QTI_COMPONENTS)))
include $(QCOM_COMMON_PATH)/system/gps/qti-gps.mk
ifeq ($(call is-board-platform-in-list,$(5_10_FAMILY) $(5_15_FAMILY)),true)
TARGET_GPS_COMPONENT_VARIANT ?= gps
else
ifeq ($(call is-board-platform-in-list,$(4_4_FAMILY) $(4_9_FAMILY) $(4_14_FAMILY) $(4_19_FAMILY) $(5_4_FAMILY)),true)
TARGET_GPS_COMPONENT_VARIANT ?= gps-legacy
else
TARGET_GPS_COMPONENT_VARIANT ?= gps
endif
include $(QCOM_COMMON_PATH)/vendor/$(TARGET_GPS_COMPONENT_VARIANT)/qti-$(TARGET_GPS_COMPONENT_VARIANT).mk
endif
@ -108,12 +108,12 @@ ifneq (,$(filter keymaster, $(TARGET_COMMON_QTI_COMPONENTS)))
endif
ifneq (,$(filter media, $(TARGET_COMMON_QTI_COMPONENTS)))
ifeq ($(call is-board-platform-in-list,$(5_10_FAMILY) $(5_15_FAMILY)),true)
TARGET_MEDIA_COMPONENT_VARIANT ?= media
ifeq ($(call is-board-platform-in-list,$(4_4_FAMILY) $(4_9_FAMILY) $(4_14_FAMILY) $(4_19_FAMILY)),true)
TARGET_MEDIA_COMPONENT_VARIANT ?= media-legacy
else ifeq ($(call is-board-platform-in-list,$(5_4_FAMILY)),true)
TARGET_MEDIA_COMPONENT_VARIANT ?= media-5.4
else
TARGET_MEDIA_COMPONENT_VARIANT ?= media-legacy
TARGET_MEDIA_COMPONENT_VARIANT ?= media
endif
include $(QCOM_COMMON_PATH)/vendor/$(TARGET_MEDIA_COMPONENT_VARIANT)/qti-$(TARGET_MEDIA_COMPONENT_VARIANT).mk
endif
@ -133,10 +133,10 @@ ifneq (,$(filter perf, $(TARGET_COMMON_QTI_COMPONENTS)))
endif
ifneq (,$(filter qseecomd, $(TARGET_COMMON_QTI_COMPONENTS)))
ifeq ($(call is-board-platform-in-list,$(5_4_FAMILY) $(5_10_FAMILY) $(5_15_FAMILY)),true)
TARGET_QSEECOMD_COMPONENT_VARIANT ?= qseecomd
else
ifeq ($(call is-board-platform-in-list,$(4_4_FAMILY) $(4_9_FAMILY) $(4_14_FAMILY) $(4_19_FAMILY)),true)
TARGET_QSEECOMD_COMPONENT_VARIANT ?= qseecomd-legacy
else
TARGET_QSEECOMD_COMPONENT_VARIANT ?= qseecomd
endif
include $(QCOM_COMMON_PATH)/vendor/$(TARGET_QSEECOMD_COMPONENT_VARIANT)/qti-$(TARGET_QSEECOMD_COMPONENT_VARIANT).mk
endif
@ -159,10 +159,10 @@ ifneq (,$(filter wfd, $(TARGET_COMMON_QTI_COMPONENTS)))
endif
ifneq (,$(filter wlan, $(TARGET_COMMON_QTI_COMPONENTS)))
ifeq ($(call is-board-platform-in-list,$(5_10_FAMILY) $(5_15_FAMILY)),true)
TARGET_WLAN_COMPONENT_VARIANT ?= wlan
else
ifeq ($(call is-board-platform-in-list,$(4_4_FAMILY) $(4_9_FAMILY) $(4_14_FAMILY) $(4_19_FAMILY) $(5_4_FAMILY)),true)
TARGET_WLAN_COMPONENT_VARIANT ?= wlan-legacy
else
TARGET_WLAN_COMPONENT_VARIANT ?= wlan
endif
include $(QCOM_COMMON_PATH)/vendor/$(TARGET_WLAN_COMPONENT_VARIANT)/qti-$(TARGET_WLAN_COMPONENT_VARIANT).mk
endif

View File

@ -16,7 +16,7 @@ PRODUCT_SOONG_NAMESPACES += \
device/qcom/common/vendor/init
# Add legacy services and permissions for pre-5.10 targets
ifeq (,$(filter 5.10 5.15, $(TARGET_KERNEL_VERSION)))
ifneq (,$(filter 4.4 4.9 4.14 4.19 5.4, $(TARGET_KERNEL_VERSION)))
PRODUCT_COPY_FILES += \
$(QCOM_COMMON_PATH)/vendor/init/init.qcom.early_boot.legacy.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.early_boot.sh \
$(QCOM_COMMON_PATH)/vendor/init/init.qcom.post_boot.legacy.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.post_boot.sh
@ -55,7 +55,7 @@ PRODUCT_COPY_FILES += \
endif
# Kernel
ifneq (,$(filter 5.4 5.10 5.15, $(TARGET_KERNEL_VERSION)))
ifeq (,$(filter 4.4 4.9 4.14 4.19, $(TARGET_KERNEL_VERSION)))
PRODUCT_COPY_FILES += \
$(call find-copy-subdir-files,*,$(QCOM_COMMON_PATH)/vendor/init/$(TARGET_BOARD_PLATFORM),$(TARGET_COPY_OUT_VENDOR))

View File

@ -30,7 +30,7 @@ PRODUCT_COPY_FILES += \
$(call find-copy-subdir-files,*,$(QCOM_COMMON_PATH)/vendor/perf/configs/$(TARGET_PERF_DIR),$(TARGET_COPY_OUT_VENDOR)/etc)
# Disable the poweropt service for <5.4 platforms.
ifeq (,$(filter 5.4 5.10 5.15, $(TARGET_KERNEL_VERSION)))
ifneq (,$(filter 4.4 4.9 4.14 4.19, $(TARGET_KERNEL_VERSION)))
PRODUCT_COPY_FILES += \
$(QCOM_COMMON_PATH)/vendor/perf/poweropt-service-disable.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/poweropt-service-disable.rc
endif
@ -59,7 +59,7 @@ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.qspm.enable=true \
vendor.perf.framepacing.enable=1
ifneq (,$(filter 4.19 5.4 5.10 5.15, $(TARGET_KERNEL_VERSION)))
ifeq (,$(filter 4.4 4.9 4.14, $(TARGET_KERNEL_VERSION)))
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.beluga.p=0x3 \
ro.vendor.beluga.c=0x4800 \

View File

@ -20,13 +20,13 @@ SOONG_CONFIG_NAMESPACES += rmnetctl
SOONG_CONFIG_rmnetctl += \
old_rmnet_data
SOONG_CONFIG_rmnetctl_old_rmnet_data ?= false
ifeq (,$(filter 5.15, $(TARGET_KERNEL_VERSION)))
ifneq (,$(filter 4.4 4.9 4.14 4.19 5.4 5.10, $(TARGET_KERNEL_VERSION)))
SOONG_CONFIG_rmnetctl_old_rmnet_data := true
endif
$(call inherit-product, vendor/qcom/opensource/dataservices/dataservices_vendor_product.mk)
# IPACM
ifneq (,$(filter 5.10 5.15, $(TARGET_KERNEL_VERSION)))
ifeq (,$(filter 4.4 4.9 4.14 4.19 5.4, $(TARGET_KERNEL_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/data-ipa-cfg-mgr
$(call inherit-product, vendor/qcom/opensource/data-ipa-cfg-mgr/ipacm_vendor_product.mk)
else
@ -78,7 +78,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.radio.fetchqos=true
endif
ifneq (,$(filter 4.14 4.19 5.4 5.10 5.15, $(TARGET_KERNEL_VERSION)))
ifeq (,$(filter 4.4 4.9, $(TARGET_KERNEL_VERSION)))
# Property to enable single ims registration
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.rcs.singlereg.feature=1

View File

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