Snap for 12605939 from 013069b478
to mainline-tzdata6-release
Change-Id: I01f9f1cde34bd08b60c4e948e3f7be8f67317fc5
This commit is contained in:
commit
cfb1348709
7 changed files with 51 additions and 11 deletions
|
@ -32,7 +32,7 @@ on boot && property:ro.build.type=userdebug && \
|
||||||
property:persist.vendor.fingerprint.disable.fake.override=100
|
property:persist.vendor.fingerprint.disable.fake.override=100
|
||||||
setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override}
|
setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override}
|
||||||
|
|
||||||
service insmod_sh_raviole /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
|
service insmod_sh_raviole /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
|
||||||
|
|
|
@ -16,7 +16,7 @@ on early-boot
|
||||||
start insmod_sh_slider
|
start insmod_sh_slider
|
||||||
|
|
||||||
|
|
||||||
service insmod_sh_slider /vendor/bin/insmod.sh /vendor/etc/init.insmod.slider.cfg
|
service insmod_sh_slider /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.slider.cfg
|
||||||
class main
|
class main
|
||||||
user root
|
user root
|
||||||
group root system
|
group root system
|
||||||
|
|
|
@ -14,7 +14,7 @@ on early-boot
|
||||||
wait_for_prop vendor.common.modules.ready 1
|
wait_for_prop vendor.common.modules.ready 1
|
||||||
start insmod_sh_whitefin
|
start insmod_sh_whitefin
|
||||||
|
|
||||||
service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor/etc/init.insmod.whitefin.cfg
|
service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.whitefin.cfg
|
||||||
class main
|
class main
|
||||||
user root
|
user root
|
||||||
group root system
|
group root system
|
||||||
|
|
|
@ -69,9 +69,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.oriole.rc
|
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.oriole.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/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.oriole.cfg
|
device/google/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.oriole.cfg
|
||||||
|
endif
|
||||||
|
|
||||||
# Thermal Config
|
# Thermal Config
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
@ -155,6 +159,12 @@ PRODUCT_PACKAGES += \
|
||||||
android.hardware.nfc-service.st \
|
android.hardware.nfc-service.st \
|
||||||
NfcOverlayOriole
|
NfcOverlayOriole
|
||||||
|
|
||||||
|
# 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 \
|
||||||
|
|
|
@ -77,9 +77,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.raven.rc
|
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.raven.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/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.raven.cfg
|
device/google/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.raven.cfg
|
||||||
|
endif
|
||||||
|
|
||||||
# Thermal Config
|
# Thermal Config
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
@ -160,6 +164,12 @@ PRODUCT_PACKAGES += \
|
||||||
android.hardware.nfc-service.st \
|
android.hardware.nfc-service.st \
|
||||||
NfcOverlayRaven
|
NfcOverlayRaven
|
||||||
|
|
||||||
|
# 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 \
|
||||||
|
|
|
@ -48,9 +48,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.slider.rc
|
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.slider.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/raviole/init.insmod.slider.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.slider.cfg
|
device/google/raviole/init.insmod.slider.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.slider.cfg
|
||||||
|
endif
|
||||||
|
|
||||||
# Thermal Config
|
# Thermal Config
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
@ -91,6 +95,12 @@ PRODUCT_PACKAGES += \
|
||||||
Tag \
|
Tag \
|
||||||
android.hardware.nfc-service.st
|
android.hardware.nfc-service.st
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
|
@ -52,9 +52,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.whitefin.rc
|
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.whitefin.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/raviole/init.insmod.whitefin.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.whitefin.cfg
|
device/google/raviole/init.insmod.whitefin.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.whitefin.cfg
|
||||||
|
endif
|
||||||
|
|
||||||
# Thermal Config
|
# Thermal Config
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
@ -87,6 +91,12 @@ PRODUCT_PACKAGES += \
|
||||||
Tag \
|
Tag \
|
||||||
android.hardware.nfc-service.st
|
android.hardware.nfc-service.st
|
||||||
|
|
||||||
|
# Shared Modem Platform
|
||||||
|
SHARED_MODEM_PLATFORM_VENDOR := lassen
|
||||||
|
|
||||||
|
# Shared Modem Platform
|
||||||
|
include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
|
||||||
|
|
||||||
# PowerStats HAL
|
# PowerStats HAL
|
||||||
PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin
|
PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue