Snap for 12462067 from 69223d3af7 to mainline-tzdata6-release

Change-Id: Icafcf8201fe983db9ed5d445b4f512f4283383e5
This commit is contained in:
Android Build Coastguard Worker 2024-10-07 09:00:57 +00:00
commit 3975f91645
6 changed files with 14 additions and 24 deletions

View file

@ -1,7 +1,11 @@
// ----------------------------------------------------------------------------
// Builds android.hardware.drm-service.castkey
//
// TODO(b/366426322): Merge these targets into `device/google/gs-common`.
soong_namespace {
}
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
@ -32,7 +36,10 @@ cc_defaults {
relative_install_path: "hw",
cflags: ["-Wall", "-Werror"],
cflags: [
"-Wall",
"-Werror",
],
include_dirs: [
"device/google/tangorpro/cast_auth/mediadrm/include",

View file

@ -56,7 +56,7 @@ DISABLE_TELEPHONY_EUICC := true
include device/google/tangorpro/audio/tangorpro/audio-tables.mk
include device/google/gs201/device-shipping-common.mk
include device/google/gs-common/touch/gti/gti.mk
include device/google/gs-common/touch/gti/predump_gti.mk
include device/google/gs-common/touch/nvt/nvt.mk
include device/google/gs-common/led/led.mk
include device/google/gs-common/wlan/dump.mk
@ -258,7 +258,10 @@ PRODUCT_VENDOR_PROPERTIES += \
PRODUCT_SOONG_NAMESPACES += \
vendor/lib64
# TODO(b/366426322): Merge CastKey Drm plugin into `device/google/gs-common`.
# CastKey Drm plugin modules
PRODUCT_SOONG_NAMESPACES += \
device/google/tangorpro/cast_auth/mediadrm
PRODUCT_PACKAGES += \
android.hardware.drm-service.castkey

View file

@ -48,15 +48,6 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.graphics.mapper</name>
<transport arch="32+64">passthrough</transport>
<version>4.0</version>
<interface>
<name>IMapper</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.graphics.composer</name>
<transport>hwbinder</transport>

View file

@ -38,6 +38,7 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce
include device/google/gs201/BoardConfig-common.mk
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-include vendor/google_devices/tangorpro/proprietary/BoardConfigVendor.mk
include device/google/tangorpro-sepolicy/tangorpro-sepolicy.mk
include device/google/tangorpro/wifi/BoardConfig-wifi.mk

View file

@ -8,21 +8,18 @@
{
"Name":"neutral_therm",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "35.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"charger_skin_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "39.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@ -30,14 +27,12 @@
{
"Name":"disp_therm",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000
@ -45,7 +40,6 @@
{
"Name":"usb_pwr_therm2",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
"Multiplier":0.001
},
{

View file

@ -4,7 +4,6 @@
"Name":"neutral_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "50.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@ -12,14 +11,12 @@
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"charger_skin_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "39.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@ -28,7 +25,6 @@
"Name":"disp_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@ -42,7 +38,6 @@
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000
@ -50,7 +45,6 @@
{
"Name":"usb_pwr_therm2",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
"Multiplier":0.001
},
{