From 031d28881e1abd1150a25ff98e7be348504be25b Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Fri, 16 Aug 2024 06:17:39 +0000 Subject: [PATCH 01/11] thermal: read thermistor temp from sysfs - avoid wrong sensor value reading for thermalHAL Bug: 327327502 Test: Build to boot to home Flag: EXEMPT (bug 337358613) Change-Id: Ie14fa095f695aa6d02f9a73016fe1952943b8b71 Signed-off-by: Peter (YM) --- thermal_info_config_charge_oriole.json | 6 ------ thermal_info_config_charge_raven.json | 7 ------- thermal_info_config_oriole.json | 7 ------- thermal_info_config_oriole_WHI_A.json | 3 --- thermal_info_config_raven.json | 7 ------- 5 files changed, 30 deletions(-) diff --git a/thermal_info_config_charge_oriole.json b/thermal_info_config_charge_oriole.json index 280dd33..17908e9 100644 --- a/thermal_info_config_charge_oriole.json +++ b/thermal_info_config_charge_oriole.json @@ -27,7 +27,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -43,7 +42,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -59,7 +57,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -84,7 +81,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -102,7 +98,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -127,7 +122,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, diff --git a/thermal_info_config_charge_raven.json b/thermal_info_config_charge_raven.json index 411383b..bb0c1c4 100644 --- a/thermal_info_config_charge_raven.json +++ b/thermal_info_config_charge_raven.json @@ -27,7 +27,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -43,7 +42,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -59,7 +57,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -84,7 +81,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -102,7 +98,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -127,7 +122,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -145,7 +139,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 2a57b61..e218126 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -19,25 +19,21 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", "35.0", "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/usb_pwr_therm2/adc_channel/channel_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -53,7 +48,6 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { @@ -61,7 +55,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/adc_channel/channel_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json index aa59ee5..1a74ade 100644 --- a/thermal_info_config_oriole_WHI_A.json +++ b/thermal_info_config_oriole_WHI_A.json @@ -36,7 +36,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -54,7 +53,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -70,7 +68,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index fe72c6b..45c9326 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -19,19 +19,16 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { @@ -39,7 +36,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/adc_channel/channel_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -47,7 +43,6 @@ { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { @@ -55,7 +50,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", "40.0", "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/usb_pwr_therm2/adc_channel/channel_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -63,7 +57,6 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { From 6b354fade5a59b45e01b5fda7ed6e5d19f8126ca Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Mon, 12 Aug 2024 17:05:58 +0800 Subject: [PATCH 02/11] gps: add CpEarlyFixGuardTimeSec to prevent earlyfix response delay Bug: 358041425 Test: verify pass Change-Id: I1e59fd67d4e8cd8d30c374d276a0a7e44b9d893d --- location/gps.6.1.xml.oriole | 1 + location/gps.6.1.xml.raven | 1 + location/gps.xml | 1 + location/gps.xml.oriole | 1 + location/gps.xml.raven | 1 + location/gps_user.6.1.xml.oriole | 1 + location/gps_user.6.1.xml.raven | 1 + location/gps_user.xml | 1 + location/gps_user.xml.oriole | 1 + location/gps_user.xml.raven | 1 + 10 files changed, 10 insertions(+) diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole index 90abf83..876e529 100644 --- a/location/gps.6.1.xml.oriole +++ b/location/gps.6.1.xml.oriole @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven index f759bf5..0e0def8 100644 --- a/location/gps.6.1.xml.raven +++ b/location/gps.6.1.xml.raven @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml b/location/gps.xml index ef328be..41b8c48 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index ae9f6fc..324c0f2 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml.raven b/location/gps.xml.raven index baea540..9e067d4 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole index 2307636..a5e6383 100644 --- a/location/gps_user.6.1.xml.oriole +++ b/location/gps_user.6.1.xml.oriole @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven index 00d9b45..11a47a5 100644 --- a/location/gps_user.6.1.xml.raven +++ b/location/gps_user.6.1.xml.raven @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml b/location/gps_user.xml index a5a4066..5aaf918 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index e04f9fe..414fee5 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index c132781..f6775ad 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" From d26fec9d636ba961a95bad9b300fd78a73b1cc0c Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Tue, 27 Aug 2024 06:25:49 +0000 Subject: [PATCH 03/11] gps: Re-enable GLO & QZSS in US Test: on-device Bug: 353579502 Change-Id: I2dd2560b9d8102829c07c027e01f36125e87cd69 --- location/gps.6.1.xml.oriole | 2 ++ location/gps.6.1.xml.raven | 2 ++ location/gps.xml | 2 ++ location/gps.xml.oriole | 2 ++ location/gps.xml.raven | 2 ++ location/gps_user.6.1.xml.oriole | 2 ++ location/gps_user.6.1.xml.raven | 2 ++ location/gps_user.xml | 2 ++ location/gps_user.xml.oriole | 2 ++ location/gps_user.xml.raven | 2 ++ 10 files changed, 20 insertions(+) diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole index 876e529..f442e3a 100644 --- a/location/gps.6.1.xml.oriole +++ b/location/gps.6.1.xml.oriole @@ -99,6 +99,8 @@ /> diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven index 0e0def8..3726311 100644 --- a/location/gps.6.1.xml.raven +++ b/location/gps.6.1.xml.raven @@ -99,6 +99,8 @@ /> diff --git a/location/gps.xml b/location/gps.xml index 41b8c48..76eb81e 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -99,6 +99,8 @@ /> diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index 324c0f2..1171998 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -99,6 +99,8 @@ /> diff --git a/location/gps.xml.raven b/location/gps.xml.raven index 9e067d4..8ca7eeb 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -99,6 +99,8 @@ /> diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole index a5e6383..ccea80d 100644 --- a/location/gps_user.6.1.xml.oriole +++ b/location/gps_user.6.1.xml.oriole @@ -97,6 +97,8 @@ /> diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven index 11a47a5..2230ace 100644 --- a/location/gps_user.6.1.xml.raven +++ b/location/gps_user.6.1.xml.raven @@ -97,6 +97,8 @@ /> diff --git a/location/gps_user.xml b/location/gps_user.xml index 5aaf918..405b8b6 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -97,6 +97,8 @@ /> diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index 414fee5..c29ae2c 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -97,6 +97,8 @@ /> diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index f6775ad..41d38c9 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -97,6 +97,8 @@ /> From 6fd62fe96ede96bfe8546e9fd3dc8bb62c0e5845 Mon Sep 17 00:00:00 2001 From: Pindar Yang Date: Thu, 29 Aug 2024 11:58:09 +0000 Subject: [PATCH 04/11] move bootloader and radio build flag to device mk Flag: build.RELEASE_GOOGLE_PRODUCT_RADIO_DIR, build.RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR Bug: 362618412 Change-Id: Id584497948d5ceb854c5f65a076815c5589ec1c8 Signed-off-by: Pindar Yang --- device-oriole.mk | 8 ++++++++ device-raven.mk | 8 ++++++++ device-slider.mk | 4 ++++ device-whitefin.mk | 4 ++++ oriole/BoardConfig.mk | 5 ----- raven/BoardConfig.mk | 5 ----- slider/BoardConfig.mk | 3 --- whitefin/BoardConfig.mk | 3 --- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index e22fb6e..65bff71 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -17,6 +17,14 @@ # 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_ORIOLE_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) diff --git a/device-raven.mk b/device-raven.mk index e1c2b1b..4ada8b4 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -17,6 +17,14 @@ # 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_RAVEN_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RAVEN_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RAVEN_DIR) diff --git a/device-slider.mk b/device-slider.mk index 09eb645..9a51f6f 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -14,6 +14,10 @@ # limitations under the License. # +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) + # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers diff --git a/device-whitefin.mk b/device-whitefin.mk index f7e19c3..c9be012 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -14,6 +14,10 @@ # limitations under the License. # +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) + # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 757ee50..36affb6 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -24,11 +24,6 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) -$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) - ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu #RBC# include_top device/google/pixel_tcu diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 06f97ae..eb1a5c8 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -24,11 +24,6 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR) -$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)) - ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu #RBC# include_top device/google/pixel_tcu diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk index 917b79a..82425d2 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -15,9 +15,6 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := slider -RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) -$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) TARGET_SCREEN_DENSITY := 560 USES_DEVICE_GOOGLE_RAVIOLE := true diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index e28f7bf..5b5a07a 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -15,9 +15,6 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := whitefin -RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) -$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) TARGET_SCREEN_DENSITY := 440 USES_DEVICE_GOOGLE_RAVIOLE := true From e0fcb2d3ba011bc7a5a2ea08f57d69b70863c486 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Thu, 23 May 2024 15:14:23 -0700 Subject: [PATCH 05/11] oriole/raven: add etm modules in userdebug/eng builds If etm modules aren't built with kernel prebuilts, then add them manually. Bug: 364309766 Bug: 340617717 Bug: 331725877 Test: build and run oriole-trunk_staging-userdebug Flag: build.RELEASE_ETM_IN_USERDEBUG_ENG Change-Id: Iea66467b22086066972b214ba7af553158f80b03 --- device-oriole.mk | 7 +++++++ device-raven.mk | 7 +++++++ oriole/BoardConfig.mk | 6 ++++++ raven/BoardConfig.mk | 6 ++++++ 4 files changed, 26 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 65bff71..10048c9 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -347,3 +347,10 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=20486 + +# 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-raven.mk b/device-raven.mk index 4ada8b4..8b790d9 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -357,3 +357,10 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=20487 + +# 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/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 36affb6..00a9a28 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -43,3 +43,9 @@ include device/google/gs101-sepolicy/oriole-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk -include vendor/google_devices/oriole/proprietary/BoardConfigVendor.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/raven/BoardConfig.mk b/raven/BoardConfig.mk index eb1a5c8..783511a 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -43,3 +43,9 @@ include device/google/gs101-sepolicy/raven-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk + +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/BoardUserdebugModules.mk +endif +endif From bad1fd46490edc933770f971527b614221ef95d3 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:20:53 +0000 Subject: [PATCH 06/11] Update product id for oriole and raven Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: Icf766314c7b23ed6cee0cf70eba5fe796d99a8b5 --- device-oriole.mk | 3 ++- device-raven.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 10048c9..95cc084 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -345,8 +345,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id +# Oriole: 0x4106 PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20486 + bluetooth.device_id.product_id=16646 # ETM ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) diff --git a/device-raven.mk b/device-raven.mk index 8b790d9..4ceb39e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -355,8 +355,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id +# Raven: 0x4107 PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20487 + bluetooth.device_id.product_id=16647 # ETM ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) From 74e1b20cc4bac936c873307cbd07d73d5c773c39 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:30:23 +0000 Subject: [PATCH 07/11] Symlink current prebuilt folder to android root The Android are now based on Trunk Stable world and Pixel prebuilts CLs also needs to reply with this which controlled by the flag which results: - the flag value might be different on each branches - the flag value are mostly different on each release configuration - for local builds, ENGs' needs to figure out the correct location of current prebuilts by checking through entire prebuilt textproto files To alleviate this problem, create an symlink file under android root indicates current prebuilt path after invoke the android lunch cmd. Bug: 364831620 Flag: EXEMPT export current prebuilt path Change-Id: I43355dc794b94084a9a1d80cc23382781eace1d8 Signed-off-by: Robin Peng --- oriole/BoardConfig.mk | 1 + raven/BoardConfig.mk | 1 + slider/BoardConfig.mk | 1 + whitefin/BoardConfig.mk | 1 + 4 files changed, 4 insertions(+) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 00a9a28..d77c0ef 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -42,6 +42,7 @@ include device/google/gs101/BoardConfig-common.mk include device/google/gs101-sepolicy/oriole-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 783511a..3d474b6 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -42,6 +42,7 @@ include device/google/gs101/BoardConfig-common.mk include device/google/gs101-sepolicy/raven-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk index 82425d2..2224d56 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -23,3 +23,4 @@ BOARD_BOOTCONFIG += androidboot.selinux=permissive include device/google/gs101/BoardConfig-common.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index 5b5a07a..27f7c98 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -23,3 +23,4 @@ BOARD_BOOTCONFIG += androidboot.selinux=permissive include device/google/gs101/BoardConfig-common.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk From ccf5dc11ce22ab494849cb67e42dce7bf3774742 Mon Sep 17 00:00:00 2001 From: James Huang Date: Fri, 26 Jul 2024 15:26:01 +0800 Subject: [PATCH 08/11] gps: Enable Beidou measurements only in the US for P21. Bug: 354884462 Test: Field test in the US Change-Id: Ic78e619a04bcdaa767a2236f9a04fbe1d240a6c4 --- location/gps.xml.oriole | 1 + location/gps.xml.raven | 1 + location/gps_user.xml.oriole | 1 + location/gps_user.xml.raven | 1 + 4 files changed, 4 insertions(+) diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index 1171998..2f191d6 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -103,6 +103,7 @@ EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" EnableNavic="true" + ConstellationAutoSwitchOffNavOnly="true" /> diff --git a/location/gps.xml.raven b/location/gps.xml.raven index 8ca7eeb..3ddfe1c 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -103,6 +103,7 @@ EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" EnableNavic="true" + ConstellationAutoSwitchOffNavOnly="true" /> diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index c29ae2c..f935676 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -101,6 +101,7 @@ EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" EnableNavic="true" + ConstellationAutoSwitchOffNavOnly="true" /> diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index 41d38c9..ff3c5e2 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -101,6 +101,7 @@ EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" EnableNavic="true" + ConstellationAutoSwitchOffNavOnly="true" /> From 96a0ec11ba0545a56f6496c5a93ecb570a3ca7f7 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 22:46:24 +0800 Subject: [PATCH 09/11] gps: set default SUPL SSL method to SSLv23 Bug: 363886476 Test: verify SUPL NI test pass Change-Id: Iefe7acffac50ff14447b7d35c9c50e699637aba1 --- location/gps.6.1.xml.oriole | 2 +- location/gps.6.1.xml.raven | 2 +- location/gps.xml | 2 +- location/gps.xml.oriole | 2 +- location/gps.xml.raven | 2 +- location/gps_user.6.1.xml.oriole | 2 +- location/gps_user.6.1.xml.raven | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.oriole | 2 +- location/gps_user.xml.raven | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole index f442e3a..df40156 100644 --- a/location/gps.6.1.xml.oriole +++ b/location/gps.6.1.xml.oriole @@ -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" diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven index 3726311..c831068 100644 --- a/location/gps.6.1.xml.raven +++ b/location/gps.6.1.xml.raven @@ -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" diff --git a/location/gps.xml b/location/gps.xml index 76eb81e..009aaec 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" diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index 2f191d6..4833857 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -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" diff --git a/location/gps.xml.raven b/location/gps.xml.raven index 3ddfe1c..d663ebf 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -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" diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole index ccea80d..0582009 100644 --- a/location/gps_user.6.1.xml.oriole +++ b/location/gps_user.6.1.xml.oriole @@ -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" diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven index 2230ace..c276c11 100644 --- a/location/gps_user.6.1.xml.raven +++ b/location/gps_user.6.1.xml.raven @@ -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" diff --git a/location/gps_user.xml b/location/gps_user.xml index 405b8b6..008efb0 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" diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index f935676..ec8d881 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -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" diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index ff3c5e2..3489a66 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -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" From dfdffd07a36af226fe58b0d8fc828a4dbd9c3a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20Ko=C5=82odziejczyk?= Date: Tue, 16 Jul 2024 11:54:42 +0000 Subject: [PATCH 10/11] audio: enable software encoded Bluetooth broadcast Bug: 345372436 Test: manual Flag: EXEMPT, trivial change Change-Id: I54a519bc01ae5886cdecd685b639e19dd35b0211 --- .../bluetooth_with_le_audio_policy_configuration_7_0.xml | 8 ++++++-- .../bluetooth_with_le_audio_policy_configuration_7_0.xml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index e3f27d9..efd7277 100644 --- a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/oriole/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/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index e3f27d9..efd7277 100644 --- a/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/raven/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 From 18a37326718129529ccdea67bc8cc3489b5ddf66 Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Wed, 25 Sep 2024 06:27:13 +0000 Subject: [PATCH 11/11] Remove vibrator HAL service Remove from device mk files due to relocation to vendor directory. Bug: 362659323 Test: Build Pass Flag: EXEMPT refactor Change-Id: Ia283a1e770aabdce202318a09f51a0d0f0567b27 --- device-oriole.mk | 1 - device-raven.mk | 2 -- device-slider.mk | 1 - device-whitefin.mk | 1 - 4 files changed, 5 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 95cc084..52a9216 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -43,7 +43,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay include device/google/raviole/audio/oriole/audio-tables.mk include device/google/gs101/device-shipping-common.mk include device/google/gs101/telephony/pktrouter.mk -include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk diff --git a/device-raven.mk b/device-raven.mk index 4ceb39e..3cfe900 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -60,8 +60,6 @@ ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) include device/google/raviole/uwb/uwb_calibration.mk endif -include hardware/google/pixel/vibrator/cs40l25/device.mk - # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,raven) $(call soong_config_set,lyric,tuning_product,raven) diff --git a/device-slider.mk b/device-slider.mk index 9a51f6f..f960cba 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -31,7 +31,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/slider/overlay include device/google/gs101/device-common.mk include device/google/raviole/audio/slider/audio-tables.mk -include hardware/google/pixel/vibrator/cs40l25/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/stm/stm11.mk diff --git a/device-whitefin.mk b/device-whitefin.mk index c9be012..d82b530 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -30,7 +30,6 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/whit DEVICE_PACKAGE_OVERLAYS += device/google/raviole/whitefin/overlay include device/google/gs101/device-common.mk -include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/gps/brcm/cbd_gps.mk