Snap for 8078460 from 23a4d7bfb3
to tm-release
Change-Id: I46a4387f29b0fc846a1d50dc4b1c014067604f00
This commit is contained in:
commit
99d204902f
5 changed files with 21 additions and 19 deletions
|
@ -32,7 +32,7 @@ TARGET_CPU_ABI := arm64-v8a
|
||||||
TARGET_CPU_VARIANT := cortex-a55
|
TARGET_CPU_VARIANT := cortex-a55
|
||||||
TARGET_CPU_VARIANT_RUNTIME := cortex-a55
|
TARGET_CPU_VARIANT_RUNTIME := cortex-a55
|
||||||
|
|
||||||
ifeq (,$(filter %_64,$(TARGET_PRODUCT)))
|
ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
|
||||||
TARGET_2ND_ARCH := arm
|
TARGET_2ND_ARCH := arm
|
||||||
TARGET_2ND_ARCH_VARIANT := armv8-a
|
TARGET_2ND_ARCH_VARIANT := armv8-a
|
||||||
TARGET_2ND_CPU_ABI := armeabi-v7a
|
TARGET_2ND_CPU_ABI := armeabi-v7a
|
||||||
|
@ -68,12 +68,7 @@ TARGET_RECOVERY_WIPE := device/google/gs101/conf/recovery.wipe
|
||||||
# This is the fstab file that will be included in the recovery image. Note that
|
# This is the fstab file that will be included in the recovery image. Note that
|
||||||
# recovery doesn't care about the encryption settings, so it doesn't matter
|
# recovery doesn't care about the encryption settings, so it doesn't matter
|
||||||
# whether we use the normal or the fips fstab here.
|
# whether we use the normal or the fips fstab here.
|
||||||
#
|
TARGET_RECOVERY_FSTAB_GENRULE = gen_fstab.gs101
|
||||||
# Since this is a generated file, it's necessary to use intermediates-dir-for in
|
|
||||||
# order to refer to it correctly. And since intermediates-dir-for isn't defined
|
|
||||||
# yet when this file is included, it's necessary to use a deferred variable
|
|
||||||
# assignment ( = ) rather than an immediate variable assignment ( := ).
|
|
||||||
TARGET_RECOVERY_FSTAB = $(call intermediates-dir-for,ETC,fstab.gs101)/fstab.gs101
|
|
||||||
|
|
||||||
TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
|
TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
|
||||||
TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
|
TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
|
||||||
|
|
|
@ -17,11 +17,12 @@
|
||||||
#
|
#
|
||||||
# All components inherited here go to system image
|
# All components inherited here go to system image
|
||||||
#
|
#
|
||||||
ifeq (,$(filter %_64,$(TARGET_PRODUCT)))
|
ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||||
else
|
else
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||||
|
|
||||||
# Enable CSI checking
|
# Enable CSI checking
|
||||||
|
|
|
@ -18,7 +18,7 @@ include device/google/gs-common/device.mk
|
||||||
|
|
||||||
TARGET_BOARD_PLATFORM := gs101
|
TARGET_BOARD_PLATFORM := gs101
|
||||||
|
|
||||||
ifneq (,$(filter %_64,$(TARGET_PRODUCT)))
|
ifneq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
|
||||||
LOCAL_64ONLY := _64
|
LOCAL_64ONLY := _64
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -564,7 +564,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/compression.mk)
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
|
||||||
|
|
||||||
# Titan-M
|
# Titan-M
|
||||||
ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
|
ifneq (,$(BOARD_HAS_DTLS))
|
||||||
include hardware/google/pixel/dauntless/dauntless.mk
|
include hardware/google/pixel/dauntless/dauntless.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -899,7 +899,7 @@ ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||||
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
|
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (,$(filter %_64,$(TARGET_PRODUCT)))
|
ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||||
else
|
else
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
||||||
|
|
|
@ -500,6 +500,12 @@ void DumpstateDevice::dumpThermalSection(int fd) {
|
||||||
"for f in /sys/class/thermal/cooling* ; do "
|
"for f in /sys/class/thermal/cooling* ; do "
|
||||||
"type=`cat $f/type` ; state2power_table=`cat $f/state2power_table` ; echo \"$type: $state2power_table\" ; "
|
"type=`cat $f/type` ; state2power_table=`cat $f/state2power_table` ; echo \"$type: $state2power_table\" ; "
|
||||||
"done"});
|
"done"});
|
||||||
|
DumpFileToFd(fd, "TMU state:", "/sys/module/gs101_thermal/parameters/tmu_reg_dump_state");
|
||||||
|
DumpFileToFd(fd, "TMU current temperature:", "/sys/module/gs101_thermal/parameters/tmu_reg_dump_current_temp");
|
||||||
|
DumpFileToFd(fd, "TMU_TOP rise thresholds:", "/sys/module/gs101_thermal/parameters/tmu_top_reg_dump_rise_thres");
|
||||||
|
DumpFileToFd(fd, "TMU_TOP fall thresholds:", "/sys/module/gs101_thermal/parameters/tmu_top_reg_dump_fall_thres");
|
||||||
|
DumpFileToFd(fd, "TMU_SUB rise thresholds:", "/sys/module/gs101_thermal/parameters/tmu_sub_reg_dump_rise_thres");
|
||||||
|
DumpFileToFd(fd, "TMU_SUB fall thresholds:", "/sys/module/gs101_thermal/parameters/tmu_sub_reg_dump_fall_thres");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Dump items related to touch
|
// Dump items related to touch
|
||||||
|
|
|
@ -111,6 +111,14 @@
|
||||||
],
|
],
|
||||||
"ResetOnInit": true
|
"ResetOnInit": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"Name": "DisplayWakeup",
|
||||||
|
"Path": "/sys/devices/platform/1c300000.drmdecon/early_wakeup",
|
||||||
|
"Values": [
|
||||||
|
"1",
|
||||||
|
"0"
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"Name": "CPUUtilThreshold",
|
"Name": "CPUUtilThreshold",
|
||||||
"Path": "/sys/kernel/vendor_sched/util_threshold",
|
"Path": "/sys/kernel/vendor_sched/util_threshold",
|
||||||
|
@ -256,14 +264,6 @@
|
||||||
],
|
],
|
||||||
"ResetOnInit": true
|
"ResetOnInit": true
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"Name": "DisplayWakeup",
|
|
||||||
"Path": "/sys/devices/platform/1c300000.drmdecon/early_wakeup",
|
|
||||||
"Values": [
|
|
||||||
"1",
|
|
||||||
"0"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"Name": "LimitFlashCurrent",
|
"Name": "LimitFlashCurrent",
|
||||||
"Path": "vendor.camera.max_flash_current",
|
"Path": "vendor.camera.max_flash_current",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue