diff --git a/device-oriole.mk b/device-oriole.mk index 8d2d196..ec89a43 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -5,14 +5,22 @@ # SPDX-License-Identifier: Apache-2.0 # -TARGET_LINUX_KERNEL_VERSION := 6.1 -TARGET_KERNEL_DEVICE := raviole -TARGET_KERNEL_DIR := device/google/$(TARGET_KERNEL_DEVICE)-kernels/$(TARGET_LINUX_KERNEL_VERSION) +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) +TARGET_KERNEL_DIR := device/google/raviole-kernels/evolution +TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers TARGET_KERNEL_PLATFORM_SOURCE := google/gs-$(TARGET_LINUX_KERNEL_VERSION) DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay-lineage DEVICE_PACKAGE_OVERLAYS += device/google/raviole/overlay-lineage +DEVICE_PACKAGE_OVERLAYS += device/google/raviole/$(DEVICE_CODENAME)/overlay-evolution include device/google/gs101/device-shipping-common.mk @@ -24,6 +32,55 @@ PRODUCT_PACKAGES += \ # Recovery files PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.oriole.rc +# Thermal Config +PRODUCT_COPY_FILES += \ + device/google/raviole/thermal_info_config_oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ + device/google/raviole/thermal_info_config_charge_oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json \ + device/google/raviole/thermal_info_config_oriole_WHI_A.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_WHI_A.json + +# Power HAL config +PRODUCT_COPY_FILES += \ + device/google/raviole/powerhint-oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json \ + device/google/raviole/powerhint-oriole-mainline.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-mainline.json \ + +# Bluetooth sepolicy +include device/google/gs101/sepolicy/oriole-sepolicy.mk + +# Bluetooth +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.a2dp_aac.vbr_supported=true \ + persist.bluetooth.firmware.selection=BCM.hcd + +# Bluetooth Tx power caps for oriole +PRODUCT_COPY_FILES += \ + device/google/raviole/bluetooth_power_limits_oriole.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + device/google/raviole/bluetooth_power_limits_oriole_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \ + device/google/raviole/bluetooth_power_limits_G9S9B_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_US.csv \ + device/google/raviole/bluetooth_power_limits_GB7N6_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_US.csv \ + device/google/raviole/bluetooth_power_limits_G9S9B_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_EU.csv \ + device/google/raviole/bluetooth_power_limits_GB7N6_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_EU.csv + +# Bluetooth HAL +PRODUCT_COPY_FILES += \ + device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf + +# MIPI Coex Configs +PRODUCT_COPY_FILES += \ + device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv \ + device/google/raviole/radio/oriole_camera_front_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_front_mipi_coex_table.csv \ + device/google/raviole/radio/oriole_camera_rear_wide_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_rear_wide_mipi_coex_table.csv + +# Camera +PRODUCT_COPY_FILES += \ + device/google/raviole/media_profiles_oriole.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml + +PRODUCT_PROPERTY_OVERRIDES += \ + persist.vendor.camera.fixed_fps_range_boost=1 + +# Display Config +PRODUCT_COPY_FILES += \ + device/google/raviole/oriole/display_golden_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_cal0.pb \ + device/google/raviole/oriole/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb # NFC PRODUCT_COPY_FILES += \ diff --git a/device-raven.mk b/device-raven.mk index 3d34727..740b9fa 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -5,11 +5,20 @@ # SPDX-License-Identifier: Apache-2.0 # -TARGET_LINUX_KERNEL_VERSION := 6.1 -TARGET_KERNEL_DEVICE := raviole -TARGET_KERNEL_DIR := device/google/$(TARGET_KERNEL_DEVICE)-kernels/$(TARGET_LINUX_KERNEL_VERSION) +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) +TARGET_KERNEL_DIR := device/google/raviole-kernels/evolution +TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers TARGET_KERNEL_PLATFORM_SOURCE := google/gs-$(TARGET_LINUX_KERNEL_VERSION) +$(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk) + DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay-lineage DEVICE_PACKAGE_OVERLAYS += device/google/raviole/overlay-lineage diff --git a/evolution.dependencies b/evolution.dependencies new file mode 100644 index 0000000..1e0c68a --- /dev/null +++ b/evolution.dependencies @@ -0,0 +1,22 @@ +[ + { + "remote": "evo-tensor", + "repository": "device_google_gs101", + "target_path": "device/google/gs101" + }, + { + "remote": "github", + "repository": "LineageOS/android_device_google_raviole-kernels", + "target_path": "device/google/raviole-kernels" + }, + { + "remote": "evo-tensor", + "repository": "vendor_google_oriole", + "target_path": "vendor/google/oriole" + }, + { + "remote": "evo-tensor", + "repository": "vendor_google_raven", + "target_path": "vendor/google/raven" + } +] diff --git a/lineage.dependencies b/lineage.dependencies deleted file mode 100644 index 6508e39..0000000 --- a/lineage.dependencies +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "repository": "android_device_google_gs101", - "target_path": "device/google/gs101" - }, - { - "repository": "android_device_google_raviole-kernels", - "target_path": "device/google/raviole-kernels" - } -] diff --git a/lineage_oriole.mk b/lineage_oriole.mk index 839dbd1..d3c17d7 100644 --- a/lineage_oriole.mk +++ b/lineage_oriole.mk @@ -4,6 +4,9 @@ # SPDX-License-Identifier: Apache-2.0 # +# Inherit some common Evolution X stuff +TARGET_DISABLE_EPPE := true + # Inherit some common stuff $(call inherit-product, vendor/lineage/config/common_full_phone.mk) @@ -13,6 +16,8 @@ DEVICE_PATH := device/google/raviole VENDOR_PATH := vendor/google/oriole $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk) +$(call inherit-product, device/google/gs101/evolution_common.mk) + # Device identifier. This must come after all inclusions PRODUCT_BRAND := google PRODUCT_MODEL := Pixel 6 diff --git a/lineage_raven.mk b/lineage_raven.mk index 96d05f4..88d22c5 100644 --- a/lineage_raven.mk +++ b/lineage_raven.mk @@ -4,6 +4,9 @@ # SPDX-License-Identifier: Apache-2.0 # +# Inherit some common Evolution X stuff +TARGET_DISABLE_EPPE := true + # Inherit some common stuff $(call inherit-product, vendor/lineage/config/common_full_phone.mk) @@ -12,6 +15,7 @@ DEVICE_CODENAME := raven DEVICE_PATH := device/google/raviole VENDOR_PATH := vendor/google/raven $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk) +$(call inherit-product, device/google/gs101/evolution_common.mk) # Device identifier. This must come after all inclusions PRODUCT_BRAND := google diff --git a/oriole/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/oriole/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml new file mode 100644 index 0000000..7663bd4 --- /dev/null +++ b/oriole/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml @@ -0,0 +1,12 @@ + + + + + + + TechPanelGM (Giovanni) + https://buymeacoffee.com/TechPanelGM + diff --git a/oriole/proprietary-files.txt b/oriole/proprietary-files.txt index 266ce2c..eab16e7 100644 --- a/oriole/proprietary-files.txt +++ b/oriole/proprietary-files.txt @@ -43,7 +43,7 @@ product/etc/sysconfig/allowlist_com.shannon.imsservice.xml product/etc/libnfc-nci.conf # Permissions -product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-lineage.xml +product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-evolution.xml product/etc/sysconfig/GoogleCamera_6gb_or_more_ram.xml product/etc/sysconfig/google-hiddenapi-package-whitelist.xml product/etc/sysconfig/nexus.xml @@ -132,7 +132,7 @@ system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksServ system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED # Permissions -system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-lineage.xml +system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-evolution.xml # Radio system_ext/etc/default-permissions/default-permissions-euiccpixel.xml diff --git a/raven/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/raven/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml new file mode 100644 index 0000000..7663bd4 --- /dev/null +++ b/raven/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml @@ -0,0 +1,12 @@ + + + + + + + TechPanelGM (Giovanni) + https://buymeacoffee.com/TechPanelGM + diff --git a/raven/proprietary-files.txt b/raven/proprietary-files.txt index a2a4f4b..39cf5af 100644 --- a/raven/proprietary-files.txt +++ b/raven/proprietary-files.txt @@ -43,7 +43,7 @@ product/etc/sysconfig/allowlist_com.shannon.imsservice.xml product/etc/libnfc-nci.conf # Permissions -product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-lineage.xml +product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-evolution.xml product/etc/sysconfig/GoogleCamera_6gb_or_more_ram.xml product/etc/sysconfig/google-hiddenapi-package-whitelist.xml product/etc/sysconfig/nexus.xml @@ -132,7 +132,7 @@ system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksServ system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED # Permissions -system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-lineage.xml +system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-evolution.xml # Radio system_ext/etc/default-permissions/default-permissions-euiccpixel.xml