diff --git a/audio/cheetah/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/cheetah/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/cheetah/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/cheetah/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file diff --git a/audio/panther/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/panther/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/panther/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/panther/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 6f7f2d5..c5076b3 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -17,16 +17,6 @@ # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) -$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) -ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) -else -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) -endif - # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 @@ -40,6 +30,13 @@ 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/cheetah/proprietary/BoardConfigVendor.mk include device/google/pantah-sepolicy/cheetah-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk + +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/BoardUserdebugModules.mk +endif +endif diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index d923b44..7d580f6 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -15,19 +15,12 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := cloudripper -RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) -$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) -ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) -else -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) -endif TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true 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 device/google/pantah-sepolicy/cloudripper-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk diff --git a/device-cheetah.mk b/device-cheetah.mk index 684eb4b..5310870 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -17,6 +17,19 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_CHEETAH_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +endif + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CHEETAH_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) @@ -35,7 +48,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/cheetah/overlay include device/google/pantah/audio/cheetah/audio-tables.mk include device/google/gs201/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/syna/syna0.mk @@ -453,5 +465,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.device_id=cheetah # Bluetooth device id +# Cheetah: 0x410A PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20490 + bluetooth.device_id.product_id=16650 + +# ETM +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif +endif \ No newline at end of file diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 723d350..6a3638f 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -17,6 +17,16 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +endif + + # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers @@ -28,7 +38,6 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cloud include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/cloudripper/audio-tables.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/touch/syna/syna0.mk diff --git a/device-panther.mk b/device-panther.mk index a629af7..08cf3bb 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -17,6 +17,19 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_PANTHER_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) +endif + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_PANTHER_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_PANTHER_DIR) @@ -33,7 +46,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/panther/overlay include device/google/pantah/audio/panther/audio-tables.mk include device/google/gs201/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/focaltech/focaltech.mk @@ -436,5 +448,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.device_id=panther # Bluetooth device id +# Panther: 0x4109 PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20489 + bluetooth.device_id.product_id=16649 + +# ETM +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif +endif diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 19f0afc..86c1858 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -17,6 +17,16 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +endif + + # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers @@ -28,7 +38,6 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/raven include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/ravenclaw/audio-tables.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/lsi/lsi.mk diff --git a/location/gps.6.1.xml.c10 b/location/gps.6.1.xml.c10 index 437fcce..a5ac7c3 100644 --- a/location/gps.6.1.xml.c10 +++ b/location/gps.6.1.xml.c10 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" @@ -99,6 +100,8 @@ /> diff --git a/location/gps.6.1.xml.p10 b/location/gps.6.1.xml.p10 index f30d7a1..62841e5 100644 --- a/location/gps.6.1.xml.p10 +++ b/location/gps.6.1.xml.p10 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" @@ -99,6 +100,8 @@ /> diff --git a/location/gps.xml b/location/gps.xml index d27a6f7..d50202c 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" @@ -99,6 +100,8 @@ /> diff --git a/location/gps.xml.c10 b/location/gps.xml.c10 index f82d6f0..7b1da4c 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" @@ -99,8 +100,11 @@ /> diff --git a/location/gps.xml.p10 b/location/gps.xml.p10 index bd2798d..5e92649 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" @@ -99,8 +100,11 @@ /> diff --git a/location/gps_user.6.1.xml.c10 b/location/gps_user.6.1.xml.c10 index f00c918..f51614d 100644 --- a/location/gps_user.6.1.xml.c10 +++ b/location/gps_user.6.1.xml.c10 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" @@ -97,6 +98,8 @@ /> diff --git a/location/gps_user.6.1.xml.p10 b/location/gps_user.6.1.xml.p10 index 6f71d32..5fd9163 100644 --- a/location/gps_user.6.1.xml.p10 +++ b/location/gps_user.6.1.xml.p10 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" @@ -97,6 +98,8 @@ /> diff --git a/location/gps_user.xml b/location/gps_user.xml index 3cde3f9..1658c49 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" @@ -97,6 +98,8 @@ /> diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10 index 84c35e7..a48c8b0 100644 --- a/location/gps_user.xml.c10 +++ b/location/gps_user.xml.c10 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" @@ -97,8 +98,11 @@ /> diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10 index 3832f9b..bdfa5c1 100644 --- a/location/gps_user.xml.p10 +++ b/location/gps_user.xml.p10 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" @@ -97,8 +98,11 @@ /> diff --git a/manifest.xml b/manifest.xml index e01d156..18109c6 100644 --- a/manifest.xml +++ b/manifest.xml @@ -48,15 +48,6 @@ default - - android.hardware.graphics.mapper - passthrough - 4.0 - - IMapper - default - - android.hardware.graphics.composer hwbinder diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index 34c72d7..efb9dd1 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -21,16 +21,6 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR) -$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) -ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)),) -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) -else -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) -endif - ifdef PHONE_CAR_BOARD_PRODUCT include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else @@ -45,6 +35,13 @@ 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/panther/proprietary/BoardConfigVendor.mk include device/google/pantah-sepolicy/panther-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk + +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/BoardUserdebugModules.mk +endif +endif diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 46267a3..0d0a92c 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -773,30 +773,6 @@ "Type": "DoHint", "Value": "LAUNCH_PMU" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 4616902..d75dfca 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -762,30 +762,6 @@ "Type": "DoHint", "Value": "LAUNCH_PMU" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index 0ead4dc..0ae59a1 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -15,19 +15,12 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ravenclaw -RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) -$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) -ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) -else -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) -endif TARGET_SCREEN_DENSITY := 560 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true 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 device/google/pantah-sepolicy/ravenclaw-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk diff --git a/thermal_info_config_charge_cheetah.json b/thermal_info_config_charge_cheetah.json index ca7e17a..8091d95 100644 --- a/thermal_info_config_charge_cheetah.json +++ b/thermal_info_config_charge_cheetah.json @@ -3,13 +3,11 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/qi_therm/tz_temp", "Multiplier":0.001 }, { @@ -17,7 +15,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -26,7 +23,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -34,7 +30,6 @@ { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", "Multiplier":0.001 }, { diff --git a/thermal_info_config_charge_panther.json b/thermal_info_config_charge_panther.json index 7ab7626..915e16c 100644 --- a/thermal_info_config_charge_panther.json +++ b/thermal_info_config_charge_panther.json @@ -3,20 +3,17 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/qi_therm/tz_temp", "Multiplier":0.001 }, { "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -24,7 +21,6 @@ { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", "Multiplier":0.001 }, { @@ -32,7 +28,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.9, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index bd7ae0b..b107385 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -9,19 +9,16 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/qi_therm/tz_temp", "Multiplier":0.001 }, { @@ -29,7 +26,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -38,7 +34,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -46,13 +41,11 @@ { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", "Multiplier":0.001 }, { "Name":"disp_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001 }, { diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 673a690..862d7c5 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -9,26 +9,22 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/qi_therm/tz_temp", "Multiplier":0.001 }, { "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -36,13 +32,11 @@ { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", "Multiplier":0.001 }, { "Name":"disp_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001 }, { @@ -50,7 +44,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.9, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000