Snap for 12605939 from 4cda2110a2
to mainline-tzdata6-release
Change-Id: I1723643d21eab48277f48b27b8005b67c45e2d85
This commit is contained in:
commit
55e6032afd
3 changed files with 14 additions and 4 deletions
|
@ -17,7 +17,7 @@ on early-boot
|
||||||
wait_for_prop vendor.common.modules.ready 1
|
wait_for_prop vendor.common.modules.ready 1
|
||||||
start insmod_sh_blueport
|
start insmod_sh_blueport
|
||||||
|
|
||||||
service insmod_sh_blueport /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
|
service insmod_sh_blueport /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg
|
||||||
class main
|
class main
|
||||||
user root
|
user root
|
||||||
group root system
|
group root system
|
||||||
|
|
|
@ -62,9 +62,13 @@ PRODUCT_COPY_FILES += \
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.bluejay.rc
|
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.bluejay.rc
|
||||||
|
|
||||||
# insmod files
|
# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
|
||||||
|
# own copy if they're not in the prebuilts.
|
||||||
|
# TODO(b/369686096): drop this when 5.10 is gone.
|
||||||
|
ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/bluejay/init.insmod.bluejay.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.bluejay.cfg
|
device/google/bluejay/init.insmod.bluejay.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.bluejay.cfg
|
||||||
|
endif
|
||||||
|
|
||||||
# Thermal Config
|
# Thermal Config
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
@ -110,6 +114,12 @@ PRODUCT_PACKAGES += \
|
||||||
android.hardware.nfc-service.st \
|
android.hardware.nfc-service.st \
|
||||||
NfcOverlayBluejay
|
NfcOverlayBluejay
|
||||||
|
|
||||||
|
# Shared Modem Platform
|
||||||
|
SHARED_MODEM_PLATFORM_VENDOR := lassen
|
||||||
|
|
||||||
|
# Shared Modem Platform
|
||||||
|
include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
|
||||||
|
|
||||||
# SecureElement
|
# SecureElement
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
android.hardware.secure_element@1.2-service-gto
|
android.hardware.secure_element@1.2-service-gto
|
||||||
|
|
|
@ -135,7 +135,7 @@ OFFHOST_ROUTE_ESE={86}
|
||||||
# host 0x00
|
# host 0x00
|
||||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||||
DEFAULT_ISODEP_ROUTE=0x81
|
DEFAULT_ISODEP_ROUTE=0x00
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Configure the HAL Clock control
|
# Configure the HAL Clock control
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue