From 2ce6ad29a4698daed54c6a11f8533b9fb9de0b91 Mon Sep 17 00:00:00 2001
From: SalmaxChang <salmaxchang@google.com>
Date: Fri, 24 Jun 2022 16:57:19 +0800
Subject: [PATCH] Not build modem artifacts with BOARD_WITHOUT_RADIO

Bug: 237050168
Change-Id: I1ffb55e4604b6b3c4db02f8138bfd8921bfa274b
---
 device.mk | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/device.mk b/device.mk
index 016d93bc..cddf5b48 100644
--- a/device.mk
+++ b/device.mk
@@ -350,27 +350,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.verbose_logging_enabled=false
 endif
 
-# CP Logging properties
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.sys.modem.logging.loc = /data/vendor/slog \
-	ro.vendor.cbd.modem_removable = "1" \
-	ro.vendor.cbd.modem_type = "s5100sit" \
-	persist.vendor.sys.modem.logging.br_num=5 \
-	persist.vendor.sys.modem.logging.enable=true
-
-# Enable silent CP crash handling
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.ril.crash_handling_mode=1
-else
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.ril.crash_handling_mode=2
-endif
-
-# Add support dual SIM mode
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.radio.multisim_switch_support=true
-
 # RPMB TA
 PRODUCT_PACKAGES += \
 	tlrpmb
@@ -896,6 +875,33 @@ USE_EARLY_SEND_DEVICE_INFO := true
 ifneq ($(BOARD_WITHOUT_RADIO),true)
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
 
+# modem_svc_sit daemon
+PRODUCT_PACKAGES += modem_svc_sit
+
+# modem logging binary/configs
+PRODUCT_PACKAGES += modem_logging_control
+
+# CP Logging properties
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.vendor.sys.modem.logging.loc = /data/vendor/slog \
+	ro.vendor.cbd.modem_removable = "1" \
+	ro.vendor.cbd.modem_type = "s5100sit" \
+	persist.vendor.sys.modem.logging.br_num=5 \
+	persist.vendor.sys.modem.logging.enable=true
+
+# Enable silent CP crash handling
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.vendor.ril.crash_handling_mode=1
+else
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.vendor.ril.crash_handling_mode=2
+endif
+
+# Add support dual SIM mode
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.vendor.radio.multisim_switch_support=true
+
 #GPS HAL
 include device/google/gs201/gnss/device-gnss.mk
 endif
@@ -919,12 +925,6 @@ PRODUCT_COPY_FILES += \
 	device/google/gs201/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \
 	frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
 
-# modem_svc_sit daemon
-PRODUCT_PACKAGES += modem_svc_sit
-
-# modem logging binary/configs
-PRODUCT_PACKAGES += modem_logging_control
-
 # modem logging configs
 PRODUCT_COPY_FILES += \
 	device/google/$(TARGET_BOARD_PLATFORM)/radio/config/logging.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/logging.conf \