Snap for 12605939 from 38c5d366ef
to mainline-tzdata6-release
Change-Id: Icf4f1a01a72361bb23be8d16c8b2bddf21066b91
This commit is contained in:
commit
97b6ab3465
13 changed files with 101 additions and 13 deletions
|
@ -15,7 +15,7 @@ on early-boot
|
||||||
wait_for_prop vendor.common.modules.ready 1
|
wait_for_prop vendor.common.modules.ready 1
|
||||||
start insmod_sh_cloudripper
|
start insmod_sh_cloudripper
|
||||||
|
|
||||||
service insmod_sh_cloudripper /vendor/bin/insmod.sh /vendor/etc/init.insmod.cloudripper.cfg
|
service insmod_sh_cloudripper /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.cloudripper.cfg
|
||||||
class main
|
class main
|
||||||
user root
|
user root
|
||||||
group root system
|
group root system
|
||||||
|
|
|
@ -13,7 +13,7 @@ on early-boot
|
||||||
wait_for_prop vendor.common.modules.ready 1
|
wait_for_prop vendor.common.modules.ready 1
|
||||||
start insmod_sh_pantah
|
start insmod_sh_pantah
|
||||||
|
|
||||||
service insmod_sh_pantah /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
|
service insmod_sh_pantah /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
|
||||||
|
|
|
@ -15,7 +15,7 @@ on early-boot
|
||||||
wait_for_prop vendor.common.modules.ready 1
|
wait_for_prop vendor.common.modules.ready 1
|
||||||
start insmod_sh_ravenclaw
|
start insmod_sh_ravenclaw
|
||||||
|
|
||||||
service insmod_sh_ravenclaw /vendor/bin/insmod.sh /vendor/etc/init.insmod.ravenclaw.cfg
|
service insmod_sh_ravenclaw /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.ravenclaw.cfg
|
||||||
class main
|
class main
|
||||||
user root
|
user root
|
||||||
group root system
|
group root system
|
||||||
|
|
|
@ -72,9 +72,13 @@ PRODUCT_COPY_FILES += \
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.cheetah.rc
|
device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.cheetah.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/pantah/init.insmod.cheetah.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cheetah.cfg
|
device/google/pantah/init.insmod.cheetah.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.cheetah.cfg
|
||||||
|
endif
|
||||||
|
|
||||||
# MIPI Coex Configs
|
# MIPI Coex Configs
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
@ -130,6 +134,12 @@ PRODUCT_PACKAGES += \
|
||||||
android.hardware.nfc-service.st \
|
android.hardware.nfc-service.st \
|
||||||
NfcOverlayCheetah
|
NfcOverlayCheetah
|
||||||
|
|
||||||
|
# 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 \
|
||||||
|
@ -474,4 +484,4 @@ ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
|
||||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
|
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -55,9 +55,13 @@ PRODUCT_COPY_FILES += \
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.cloudripper.rc
|
device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.cloudripper.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/pantah/init.insmod.cloudripper.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cloudripper.cfg
|
device/google/pantah/init.insmod.cloudripper.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.cloudripper.cfg
|
||||||
|
endif
|
||||||
|
|
||||||
# Camera
|
# Camera
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
@ -79,6 +83,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 \
|
||||||
|
|
|
@ -63,9 +63,13 @@ PRODUCT_COPY_FILES += \
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.panther.rc
|
device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.panther.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/pantah/init.insmod.panther.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.panther.cfg
|
device/google/pantah/init.insmod.panther.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.panther.cfg
|
||||||
|
endif
|
||||||
|
|
||||||
# MIPI Coex Configs
|
# MIPI Coex Configs
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
@ -109,6 +113,12 @@ PRODUCT_PACKAGES += \
|
||||||
android.hardware.nfc-service.st \
|
android.hardware.nfc-service.st \
|
||||||
NfcOverlayPanther
|
NfcOverlayPanther
|
||||||
|
|
||||||
|
# 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 \
|
||||||
|
|
|
@ -59,9 +59,13 @@ PRODUCT_COPY_FILES += \
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.ravenclaw.rc
|
device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.ravenclaw.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/pantah/init.insmod.ravenclaw.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.ravenclaw.cfg
|
device/google/pantah/init.insmod.ravenclaw.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.ravenclaw.cfg
|
||||||
|
endif
|
||||||
|
|
||||||
# Camera
|
# Camera
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
|
|
@ -29,3 +29,9 @@ PRODUCT_MANUFACTURER := Google
|
||||||
# default BDADDR for EVB only
|
# default BDADDR for EVB only
|
||||||
PRODUCT_PROPERTY_OVERRIDES += \
|
PRODUCT_PROPERTY_OVERRIDES += \
|
||||||
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
|
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
|
||||||
|
|
||||||
|
# Shared Modem Platform
|
||||||
|
SHARED_MODEM_PLATFORM_VENDOR := lassen
|
||||||
|
|
||||||
|
# Shared Modem Platform
|
||||||
|
include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -995,6 +995,18 @@
|
||||||
"Duration": 100,
|
"Duration": 100,
|
||||||
"Value": "0"
|
"Value": "0"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"PowerHint": "CAMERA_MULTICAM_BOOST",
|
||||||
|
"Node": "CDPreferIdle",
|
||||||
|
"Duration": 100,
|
||||||
|
"Value": "1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"PowerHint": "CAMERA_MULTICAM_BOOST",
|
||||||
|
"Node": "PMU_POLL",
|
||||||
|
"Duration": 100,
|
||||||
|
"Value": "0"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
|
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
|
||||||
"Node": "TAPreferHighCap",
|
"Node": "TAPreferHighCap",
|
||||||
|
|
|
@ -1135,6 +1135,18 @@
|
||||||
"Duration": 100,
|
"Duration": 100,
|
||||||
"Value": "0"
|
"Value": "0"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"PowerHint": "CAMERA_MULTICAM_BOOST",
|
||||||
|
"Node": "CDPreferIdle",
|
||||||
|
"Duration": 100,
|
||||||
|
"Value": "1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"PowerHint": "CAMERA_MULTICAM_BOOST",
|
||||||
|
"Node": "PMU_POLL",
|
||||||
|
"Duration": 100,
|
||||||
|
"Value": "0"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
|
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
|
||||||
"Node": "TAPreferHighCap",
|
"Node": "TAPreferHighCap",
|
||||||
|
|
|
@ -984,6 +984,18 @@
|
||||||
"Duration": 100,
|
"Duration": 100,
|
||||||
"Value": "0"
|
"Value": "0"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"PowerHint": "CAMERA_MULTICAM_BOOST",
|
||||||
|
"Node": "CDPreferIdle",
|
||||||
|
"Duration": 100,
|
||||||
|
"Value": "1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"PowerHint": "CAMERA_MULTICAM_BOOST",
|
||||||
|
"Node": "PMU_POLL",
|
||||||
|
"Duration": 100,
|
||||||
|
"Value": "0"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
|
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
|
||||||
"Node": "TAPreferHighCap",
|
"Node": "TAPreferHighCap",
|
||||||
|
|
|
@ -1093,6 +1093,18 @@
|
||||||
"Duration": 100,
|
"Duration": 100,
|
||||||
"Value": "0"
|
"Value": "0"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"PowerHint": "CAMERA_MULTICAM_BOOST",
|
||||||
|
"Node": "CDPreferIdle",
|
||||||
|
"Duration": 100,
|
||||||
|
"Value": "1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"PowerHint": "CAMERA_MULTICAM_BOOST",
|
||||||
|
"Node": "PMU_POLL",
|
||||||
|
"Duration": 100,
|
||||||
|
"Value": "0"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
|
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
|
||||||
"Node": "TAPreferHighCap",
|
"Node": "TAPreferHighCap",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue