From ef340fd3e3a1445440ad67c49e131f5e9cc6181a Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 12 Nov 2025 23:44:14 +0200 Subject: [PATCH] raviole: Remove unused flags Change-Id: Ib0f1649d6a8bed722f782e20f2228bcbd0825276 --- device-oriole.mk | 19 ++----------------- device-raven.mk | 20 ++------------------ oriole/BoardConfig.mk | 13 ++----------- raven/BoardConfig.mk | 13 ++----------- 4 files changed, 8 insertions(+), 57 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index b5c099e..3c693a7 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -26,11 +26,6 @@ include device/google/gs101/device-shipping-common.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk -# go/lyric-soong-variables -$(call soong_config_set,lyric,camera_hardware,oriole) -$(call soong_config_set,lyric,tuning_product,oriole) -$(call soong_config_set,google3a_config,target_device,oriole) - # Init files PRODUCT_COPY_FILES += \ device/google/raviole/conf/init.raviole.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.raviole.rc \ @@ -106,9 +101,6 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayOriole -# Shared Modem Platform -SHARED_MODEM_PLATFORM_VENDOR := lassen - # Shared Modem Platform include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk @@ -133,8 +125,6 @@ PRODUCT_PRODUCT_PROPERTIES +=\ ro.vendor.vibrator.hal.loc.coeff=2.25 \ persist.vendor.vibrator.hal.chirp.enabled=0 -ACTUATOR_MODEL := luxshare_ict_081545 - # PowerStats HAL PRODUCT_SOONG_NAMESPACES += \ device/google/raviole/powerstats/oriole \ @@ -239,13 +229,8 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.opus.enabled=true # Location -ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) - PRODUCT_COPY_FILES += \ - device/google/raviole/location/gps_user.6.1.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml -else - PRODUCT_COPY_FILES += \ - device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml -endif +PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.6.1.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index a01d6fd..87975ba 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -30,11 +30,6 @@ include device/google/gs-common/touch/lsi/lsi.mk include device/google/raviole/uwb/uwb_calibration.mk -# go/lyric-soong-variables -$(call soong_config_set,lyric,camera_hardware,raven) -$(call soong_config_set,lyric,tuning_product,raven) -$(call soong_config_set,google3a_config,target_device,raven) - PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.support_kernel_idle_timer=true PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_frame_rate_override=true @@ -111,9 +106,6 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayRaven -# Shared Modem Platform -SHARED_MODEM_PLATFORM_VENDOR := lassen - # Shared Modem Platform include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk @@ -131,7 +123,6 @@ PRODUCT_COPY_FILES += \ DEVICE_MANIFEST_FILE += \ device/google/raviole/nfc/manifest_se.xml - # Vibrator HAL PRODUCT_PRODUCT_PROPERTIES +=\ ro.vendor.vibrator.hal.long.frequency.shift=15 \ @@ -139,8 +130,6 @@ PRODUCT_PRODUCT_PROPERTIES +=\ ro.vendor.vibrator.hal.loc.coeff=2.5 \ persist.vendor.vibrator.hal.chirp.enabled=0 -ACTUATOR_MODEL := luxshare_ict_081545 - # Display LBE PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 @@ -248,13 +237,8 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.opus.enabled=true # Location -ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) - PRODUCT_COPY_FILES += \ - device/google/raviole/location/gps_user.6.1.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml -else - PRODUCT_COPY_FILES += \ - device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml -endif +PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.6.1.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index b984e91..c84b69c 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -24,24 +24,15 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 -ifdef AUTOMOTIVE_PRODUCT_PATH - #RBC# include_top device/google/auto_tcu - #RBC# include_top device/google/pixel_tcu - #RBC# include_top device/google_car - include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk -else - TARGET_SCREEN_DENSITY := 420 -endif - TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := oriole -USES_DEVICE_GOOGLE_RAVIOLE := true +TARGET_SCREEN_DENSITY := 420 + BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk include device/google/gs101/sepolicy/oriole-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk DEVICE_PATH := device/google/raviole VENDOR_PATH := vendor/google/oriole diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 81ddf82..6610f2e 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -24,24 +24,15 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 -ifdef AUTOMOTIVE_PRODUCT_PATH - #RBC# include_top device/google/auto_tcu - #RBC# include_top device/google/pixel_tcu - #RBC# include_top device/google_car - include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk -else - TARGET_SCREEN_DENSITY := 560 -endif - TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := raven -USES_DEVICE_GOOGLE_RAVIOLE := true +TARGET_SCREEN_DENSITY := 560 + BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk include device/google/gs101/sepolicy/raven-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk DEVICE_PATH := device/google/raviole VENDOR_PATH := vendor/google/raven