From 8458b558d72d3f72336242823217a4708f4a419f Mon Sep 17 00:00:00 2001 From: Tim Lin Date: Fri, 28 Jun 2024 15:53:38 +0000 Subject: [PATCH] Include ril.mk after DEVICE_MANIFEST_FILE is reset Bug: 348631842 Flag: EXEMPT bugfix Test: check carrier ID property is set correctly (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e116a1fba401aa5f9e367ebcaecbe56f38316510) Merged-In: I40160c14f65d5193962dd3f1e2862d129c8404b6 Change-Id: I40160c14f65d5193962dd3f1e2862d129c8404b6 --- device.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/device.mk b/device.mk index d0097dc..04981c5 100644 --- a/device.mk +++ b/device.mk @@ -275,11 +275,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Pixel Logger include hardware/google/pixel/PixelLogger/PixelLogger.mk -# RIL extension service -ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT))) -include device/google/gs-common/pixel_ril/ril.mk -endif - # Use Lassen specifc Shared Modem Platform SHARED_MODEM_PLATFORM_VENDOR := lassen @@ -1207,6 +1202,13 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk # UFS: the script is used to select the corresponding firmware to run FFU. PRODUCT_PACKAGES_DEBUG += ufs_firmware_update.sh +ifneq ($(BOARD_WITHOUT_RADIO),true) +# RIL extension service +ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT))) +include device/google/gs-common/pixel_ril/ril.mk +endif +endif + SUPPORT_VENDOR_SATELLITE_SERVICE := true # Telephony satellite geofence data file