diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 61f4c0e..3196d76 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -1,8 +1,8 @@ # -# Copyright (C) 2021 The LineageOS Project +# Copyright (C) 2021-2024 The LineageOS Project # # SPDX-License-Identifier: Apache-2.0 # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_lemonadep.mk + $(LOCAL_DIR)/lineage_ferrari.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index f4a4f84..3124daf 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -5,9 +5,9 @@ # # Include the common OEM chipset BoardConfig. -include device/oneplus/sm8350-common/BoardConfigCommon.mk +include device/oneplus/sm8450-common/BoardConfigCommon.mk -DEVICE_PATH := device/oneplus/lemonadep +DEVICE_PATH := device/realme/ferrari # Display TARGET_SCREEN_DENSITY := 450 @@ -22,4 +22,4 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop TARGET_RECOVERY_UI_MARGIN_HEIGHT := 103 # Include the proprietary files BoardConfig. -include vendor/oneplus/lemonadep/BoardConfigVendor.mk +include vendor/realme/ferrari/BoardConfigVendor.mk diff --git a/board-info.txt b/board-info.txt index 5a96ab7..2aecaa1 100644 --- a/board-info.txt +++ b/board-info.txt @@ -1 +1 @@ -require board=lahaina|OnePlus9Pro +require board=taro|RED8ACL1 diff --git a/device.mk b/device.mk index 6dbeffd..57405c6 100644 --- a/device.mk +++ b/device.mk @@ -16,16 +16,16 @@ PRODUCT_PACKAGES += \ # Audio PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_ODM)/etc/audio_platform_info.xml \ - $(LOCAL_PATH)/audio/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_lahaina/audio_platform_info_intcodec.xml \ + $(LOCAL_PATH)/audio/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_taro/audio_platform_info_intcodec.xml \ $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_ODM)/etc/mixer_paths.xml \ - $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_lahaina/mixer_paths.xml \ + $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_taro/mixer_paths.xml \ $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_ODM)/etc/sound_trigger_mixer_paths.xml \ - $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_lahaina/sound_trigger_mixer_paths.xml \ + $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_taro/sound_trigger_mixer_paths.xml \ $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_ODM)/etc/sound_trigger_platform_info.xml \ - $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_lahaina/sound_trigger_platform_info.xml + $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_taro/sound_trigger_platform_info.xml # Boot animation -TARGET_SCREEN_HEIGHT := 2376 +TARGET_SCREEN_HEIGHT := 2412 TARGET_SCREEN_WIDTH := 1080 # Camera @@ -74,7 +74,7 @@ PRODUCT_SOONG_NAMESPACES += \ $(LOCAL_PATH) # Inherit from the common OEM chipset makefile. -$(call inherit-product, device/oneplus/sm8350-common/common.mk) +$(call inherit-product, device/oneplus/sm8450-common/common.mk) # Inherit from the proprietary files makefile. -$(call inherit-product, vendor/oneplus/lemonadep/lemonadep-vendor.mk) +$(call inherit-product, vendor/realme/ferrari/ferrari-vendor.mk) diff --git a/extract-files.py b/extract-files.py index 8bf9020..9881c6b 100755 --- a/extract-files.py +++ b/extract-files.py @@ -26,7 +26,7 @@ from extract_utils.utils import ( namespace_imports = [ 'hardware/oplus', - 'vendor/oneplus/sm8350-common', + 'vendor/oneplus/sm8450-common', 'vendor/qcom/opensource/display', ] @@ -103,8 +103,8 @@ blob_fixups: blob_fixups_user_type = { } # fmt: skip module = ExtractUtilsModule( - 'lemonadep', - 'oneplus', + 'ferrari', + 'realme', namespace_imports=namespace_imports, blob_fixups=blob_fixups, lib_fixups=lib_fixups, @@ -113,6 +113,6 @@ module = ExtractUtilsModule( if __name__ == '__main__': utils = ExtractUtils.device_with_common( - module, 'sm8350-common', module.vendor + module, '../oneplus/sm8450-common', module.vendor ) utils.run() diff --git a/lineage.dependencies b/lineage.dependencies index 4129e3d..ef864c1 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -1,6 +1,6 @@ [ { - "repository": "android_device_oneplus_sm8350-common", - "target_path": "device/oneplus/sm8350-common" + "repository": "android_device_oneplus_sm8450-common", + "target_path": "device/oneplus/sm8450-common" } ] diff --git a/lineage_ferrari.mk b/lineage_ferrari.mk new file mode 100644 index 0000000..5acbe63 --- /dev/null +++ b/lineage_ferrari.mk @@ -0,0 +1,32 @@ +# +# Copyright (C) 2021-2024 The LineageOS Project +# +# SPDX-License-Identifier: Apache-2.0 +# + +# Inherit from those products. Most specific first. +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +TARGET_SUPPORTS_OMX_SERVICE := false +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) + +# Inherit from ferrari device +$(call inherit-product, device/realme/ferrari/device.mk) + +# Inherit some common Lineage stuff. +$(call inherit-product, vendor/lineage/config/common_full_phone.mk) + +PRODUCT_NAME := lineage_ferrari +PRODUCT_DEVICE := ferrari +PRODUCT_MANUFACTURER := realme +PRODUCT_BRAND := realme +PRODUCT_MODEL := RMX3301 + +PRODUCT_GMS_CLIENTID_BASE := android-oppo + +PRODUCT_BUILD_PROP_OVERRIDES += \ + BuildDesc="RMX3301-user 14 UP1A.230620.001 S.14b9d95_34b46-2684b release-keys" \ + BuildFingerprint=realme/RMX3301/RED8ACL1:14/UP1A.230620.001/S.14b9d95_34b46-2684b:user/release-keys \ + DeviceName=RED8ACL1 \ + DeviceProduct=RMX3301 \ + SystemDevice=RED8ACL1 \ + SystemName=RMX3301 diff --git a/lineage_lemonadep.mk b/lineage_lemonadep.mk deleted file mode 100644 index f92309c..0000000 --- a/lineage_lemonadep.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright (C) 2021-2024 The LineageOS Project -# -# SPDX-License-Identifier: Apache-2.0 -# - -# Inherit from those products. Most specific first. -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -TARGET_SUPPORTS_OMX_SERVICE := false -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) - -# Inherit from lemonadep device -$(call inherit-product, device/oneplus/lemonadep/device.mk) - -# Inherit some common Lineage stuff. -$(call inherit-product, vendor/lineage/config/common_full_phone.mk) - -PRODUCT_NAME := lineage_lemonadep -PRODUCT_DEVICE := lemonadep -PRODUCT_MANUFACTURER := OnePlus -PRODUCT_BRAND := OnePlus -PRODUCT_MODEL := LE2125 - -PRODUCT_GMS_CLIENTID_BASE := android-oneplus - -PRODUCT_BUILD_PROP_OVERRIDES += \ - BuildDesc="OnePlus9Pro-user 14 UKQ1.230924.001 R.1d5a0be-1-4ffee release-keys" \ - BuildFingerprint=OnePlus/OnePlus9Pro/OnePlus9Pro:14/UKQ1.230924.001/R.1d5a0be-1-4ffee:user/release-keys \ - DeviceName=OnePlus9Pro \ - DeviceProduct=OnePlus9Pro \ - SystemDevice=OnePlus9Pro \ - SystemName=OnePlus9Pro diff --git a/overlay/OPlusSettingsProviderResTarget/res/values/defaults.xml b/overlay/OPlusSettingsProviderResTarget/res/values/defaults.xml index aed53a4..fa76525 100644 --- a/overlay/OPlusSettingsProviderResTarget/res/values/defaults.xml +++ b/overlay/OPlusSettingsProviderResTarget/res/values/defaults.xml @@ -6,6 +6,6 @@ - OnePlus 9 Pro + realme GT 2 Pro diff --git a/vendor.prop b/vendor.prop index 2a355df..acdd21d 100644 --- a/vendor.prop +++ b/vendor.prop @@ -1,9 +1,9 @@ # Bluetooth -bluetooth.device.default_name=OnePlus 9 Pro +bluetooth.device.default_name=realme GT 2 Pro # Graphics ro.surface_flinger.set_idle_timer_ms=250 ro.surface_flinger.set_touch_timer_ms=300 # USB -vendor.usb.product_string=OnePlus 9 Pro +vendor.usb.product_string=realme GT 2 Pro