From af37ee214a6d2660d12f6e53a2edd7daaaa09d6d Mon Sep 17 00:00:00 2001
From: Terry Huang <terrycrhuang@google.com>
Date: Thu, 2 Dec 2021 15:08:55 +0000
Subject: [PATCH] [s5300][device] Change vendor telephony code path

Add extra folder for different platforms

Bug: 199954706
Test: Build pass
Change-Id: I4a88242ceb108e642c5f818cdc6aa24d8644fd0a
---
 device-common.mk |  1 +
 device.mk        | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/device-common.mk b/device-common.mk
index 5cdcb856..a8e7b05a 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+-include vendor/google_devices/gs201/proprietary/telephony/device-vendor.mk
 include device/google/gs201/device.mk
 
 # Telephony
diff --git a/device.mk b/device.mk
index 4b1a9468..390cc32e 100644
--- a/device.mk
+++ b/device.mk
@@ -57,6 +57,10 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 	ro.oem_unlock_supported=1
 
+# Include vendor telephony soong namespace
+PRODUCT_SOONG_NAMESPACES += \
+	vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)
+
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 #Set IKE logs to verbose for WFC
 PRODUCT_PROPERTY_OVERRIDES += log.tag.IKE=VERBOSE
@@ -810,11 +814,11 @@ PRODUCT_PACKAGES += \
 	vts.bin
 
 # This will be called only if IMSService is building with source code for dev branches.
-$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/shannon-ims/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-ims/device-vendor.mk)
 
 PRODUCT_PACKAGES += ShannonIms
 
-$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/shannon-iwlan/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-iwlan/device-vendor.mk)
 
 #RCS Test Messaging App
 PRODUCT_PACKAGES_DEBUG += \
@@ -840,7 +844,7 @@ USE_RADIO_HAL_1_6 := true
 #$(call inherit-product, vendor/google_devices/gs201/proprietary/device-vendor.mk)
 
 ifneq ($(BOARD_WITHOUT_RADIO),true)
-$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/common/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
 endif
 
 #GPS HAL