From d8610a1415f2a0bec4ddf5fb7c5370c69b10fb87 Mon Sep 17 00:00:00 2001 From: Roger Liao Date: Wed, 27 Jul 2022 19:04:58 +0800 Subject: [PATCH] gs101: exclude vendor telephony code if BOARD_WITHOUT_RADIO Bug: 235907512 Bug: 238702410 Bug: 238702413 Test: build pass, boot successfully, adb shell pm list features Change-Id: I9d0fb3d1ffb91c527fabcabd2c823f0e804e9fd6 --- device-common.mk | 2 ++ device.mk | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/device-common.mk b/device-common.mk index 0cc6a40f..d9522989 100644 --- a/device-common.mk +++ b/device-common.mk @@ -14,7 +14,9 @@ # limitations under the License. # +ifneq ($(BOARD_WITHOUT_RADIO),true) -include vendor/google_devices/gs101/proprietary/telephony/device-vendor.mk +endif include device/google/gs101/device.mk include device/google/gs101/tts/voice_packs.mk diff --git a/device.mk b/device.mk index 3ea32c3a..2cee2129 100644 --- a/device.mk +++ b/device.mk @@ -66,9 +66,11 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 +ifneq ($(BOARD_WITHOUT_RADIO),true) # Include vendor telephony soong namespace PRODUCT_SOONG_NAMESPACES += \ vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY) +endif ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) #Set IKE logs to verbose for WFC @@ -898,6 +900,7 @@ PRODUCT_PACKAGES += \ calliope_iva.bin \ vts.bin +ifneq ($(BOARD_WITHOUT_RADIO),true) # This will be called only if IMSService is building with source code for dev branches. $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-ims/device-vendor.mk) @@ -910,6 +913,7 @@ PRODUCT_PACKAGES_DEBUG += \ TestRcsApp PRODUCT_PACKAGES += ShannonRcs +endif # Boot Control HAL PRODUCT_PACKAGES += \ @@ -1164,8 +1168,10 @@ include hardware/google/pixel/common/pixel-common-device.mk # Pixel Logger include hardware/google/pixel/PixelLogger/PixelLogger.mk +ifneq ($(BOARD_WITHOUT_RADIO),true) # Telephony include device/google/gs101/telephony/user.mk +endif # Wifi ext include hardware/google/pixel/wifi_ext/device.mk