commit fb57c0042f453cc71efe6ff8ca1e7d14b988b639
author Bruno Martins <bgcngm@gmail.com> Tue Sep 13 01:09:39 2022 +0100
committer Jackeagle <jackeagle102@gmail.com> Wed Oct 19 08:42:23 2022 +0200
tree e6e9a1719c4a2433f6e90987f8dd53f8313783db
parent 780709a38f9ac81756b11257e71f22c58bb1a980

QCOM: Use legacy-um ipacm for all legacy UM platforms

Change-Id: I5ee44f8d8b8a4773376343a4df917ab333737fe1

config/BoardConfigQcom.mk

diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index 8192d28..5f5870a 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -19,6 +19,7 @@
 UM_4_19_FAMILY := $(KONA) $(LITO) $(BENGAL)
 UM_5_4_FAMILY := $(LAHAINA) $(HOLI)
 UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)
+LEGACY_UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)
 QSSI_SUPPORTED_PLATFORMS := $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)
 
 ifeq ($(TARGET_USES_UM_4_19),true)
@@ -156,7 +157,11 @@
 
 # Add data-ipa-cfg-mgr to PRODUCT_SOONG_NAMESPACES if needed
 ifneq ($(USE_DEVICE_SPECIFIC_DATA_IPA_CFG_MGR),true)
-    PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/data-ipa-cfg-mgr
+    ifneq ($(filter $(LEGACY_UM_PLATFORMS),$(TARGET_BOARD_PLATFORM)),)
+        PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/data-ipa-cfg-mgr-legacy-um
+    else
+        PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/data-ipa-cfg-mgr
+    endif
 endif
 
 # Add dataservices to PRODUCT_SOONG_NAMESPACES if needed