Evolution-X-Tensor/device_google_gs201
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Revert "[s5300][device] Change vendor telephony code path""

Browse source 
This reverts commit 5bc64a0b8d.

Reason for revert: Restore 16405845-t-codebase-seperate

Change-Id: I5bdebb6e682939868356a36c6b627bb67117a29c
This commit is contained in:
Terry Huang 2022-01-06 17:40:50 +08:00 • committed by TreeHugger Robot
parent 5012cf9368
commit cfefc37e7d
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
device-common.mk
View file

@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
# #
-include vendor/google_devices/gs201/proprietary/telephony/device-vendor.mk
include device/google/gs201/device.mk include device/google/gs201/device.mk
# Telephony # Telephony

10
device.mk
View file

@ -58,6 +58,10 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.oem_unlock_supported=1 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))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
#Set IKE logs to verbose for WFC #Set IKE logs to verbose for WFC
PRODUCT_PROPERTY_OVERRIDES += log.tag.IKE=VERBOSE PRODUCT_PROPERTY_OVERRIDES += log.tag.IKE=VERBOSE
@ -807,11 +811,11 @@ PRODUCT_PACKAGES += \
vts.bin vts.bin
# This will be called only if IMSService is building with source code for dev branches. # 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 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 #RCS Test Messaging App
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \
@ -837,7 +841,7 @@ USE_RADIO_HAL_1_6 := true
#$(call inherit-product, vendor/google_devices/gs201/proprietary/device-vendor.mk) #$(call inherit-product, vendor/google_devices/gs201/proprietary/device-vendor.mk)
ifneq ($(BOARD_WITHOUT_RADIO),true) 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 endif
#GPS HAL #GPS HAL