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

Include ril.mk after DEVICE_MANIFEST_FILE is reset

Browse source 
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
This commit is contained in:
Tim Lin 2024-06-28 15:53:38 +00:00 • committed by Android Build Coastguard Worker
parent 8ec17f766a
commit 8458b558d7
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
device.mk
View file

@ -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