Merge "Include ril.mk after DEVICE_MANIFEST_FILE is reset" into main

This commit is contained in:
Treehugger Robot 2024-07-01 13:37:39 +00:00 committed by Android (Google) Code Review
commit b38343b696

View file

@ -278,11 +278,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
@ -1216,6 +1211,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