diff --git a/AndroidProducts.mk b/AndroidProducts.mk index e1cd660..9f3d059 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -4,4 +4,4 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_rhodep.mk + $(LOCAL_DIR)/lineage_milanf.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index 7d6f8c0..b0f78b0 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # -DEVICE_PATH := device/motorola/rhodep +DEVICE_PATH := device/motorola/milanf # Inherit from motorola sm6375-common include device/motorola/sm6375-common/BoardConfigCommon.mk @@ -12,7 +12,7 @@ include device/motorola/sm6375-common/BoardConfigCommon.mk AUDIO_FEATURE_ENABLED_EXT_AMPLIFIER := true # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := rhodep +TARGET_BOOTLOADER_BOARD_NAME := milanf # HIDL DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml @@ -23,8 +23,8 @@ ODM_MANIFEST_DN_FILES := $(DEVICE_PATH)/sku/manifest_dn.xml ODM_MANIFEST_N_FILES := $(DEVICE_PATH)/sku/manifest_n.xml # Kernel -BOARD_KERNEL_CMDLINE += androidboot.hab.product=rhodep -TARGET_KERNEL_CONFIG += vendor/ext_config/moto-holi-rhodep.config +BOARD_KERNEL_CMDLINE += androidboot.hab.product=milanf +TARGET_KERNEL_CONFIG += vendor/ext_config/moto-holi-milanf.config # Kernel Modules BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load)) @@ -53,4 +53,4 @@ BOARD_AVB_ROLLBACK_INDEX := 29 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := 29 # inherit from the proprietary version -include vendor/motorola/rhodep/BoardConfigVendor.mk +include vendor/motorola/milanf/BoardConfigVendor.mk diff --git a/README.md b/README.md index 6e83f21..723e2f4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -Device tree for the Motorola moto g82 +Device tree for the Motorola moto g stylus 5G (2022) -Information about the device, build and install instructions can be found [here](http://wiki.lineageos.org/devices/rhodep/) +Information about the device, build and install instructions can be found [here](http://wiki.lineageos.org/devices/milanf/) diff --git a/device.mk b/device.mk index ec7c2cd..e636e74 100644 --- a/device.mk +++ b/device.mk @@ -4,7 +4,7 @@ # # Boot animation -TARGET_SCREEN_HEIGHT := 2400 +TARGET_SCREEN_HEIGHT := 2460 TARGET_SCREEN_WIDTH := 1080 # Screen @@ -77,7 +77,7 @@ $(foreach DEVICE_SKU, $(DEVICE_SKUS), \ # Sensors PRODUCT_PACKAGES += \ - sensors.rhodep + sensors.milanf PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf @@ -86,4 +86,4 @@ PRODUCT_COPY_FILES += \ PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH) # Inherit from vendor blobs -$(call inherit-product, vendor/motorola/rhodep/rhodep-vendor.mk) +$(call inherit-product, vendor/motorola/milanf/milanf-vendor.mk) diff --git a/extract-files.py b/extract-files.py index 631d986..f128fc5 100755 --- a/extract-files.py +++ b/extract-files.py @@ -20,7 +20,7 @@ from extract_utils.main import ( ) namespace_imports = [ - 'device/motorola/rhodep', + 'device/motorola/milanf', 'hardware/motorola', 'vendor/motorola/sm6375-common', 'vendor/qcom/opensource/display', @@ -52,7 +52,7 @@ extract_fns: extract_fns_user_type = { } module = ExtractUtilsModule( - 'rhodep', + 'milanf', 'motorola', blob_fixups=blob_fixups, lib_fixups=lib_fixups, diff --git a/lineage_rhodep.mk b/lineage_milanf.mk similarity index 59% rename from lineage_rhodep.mk rename to lineage_milanf.mk index 926fae0..66e1a59 100644 --- a/lineage_rhodep.mk +++ b/lineage_milanf.mk @@ -8,21 +8,21 @@ $(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 rhodep device -$(call inherit-product, device/motorola/rhodep/device.mk) +# Inherit from milanf device +$(call inherit-product, device/motorola/milanf/device.mk) # Inherit some common Lineage stuff. $(call inherit-product, vendor/lineage/config/common_full_phone.mk) -PRODUCT_NAME := lineage_rhodep -PRODUCT_DEVICE := rhodep +PRODUCT_NAME := lineage_milanf +PRODUCT_DEVICE := milanf PRODUCT_MANUFACTURER := motorola PRODUCT_BRAND := motorola -PRODUCT_MODEL := moto g82 5G +PRODUCT_MODEL := moto g stylus 5G (2022) PRODUCT_GMS_CLIENTID_BASE := android-motorola PRODUCT_BUILD_PROP_OVERRIDES += \ - BuildDesc="rhodep_g-user 13 T1SUS33.1-124-6-16 5406e-b418a2 release-keys" \ - BuildFingerprint=motorola/rhodep_g/rhodep:13/T1SUS33.1-124-6-16/5406e-b418a2:user/release-keys \ - DeviceProduct=rhodep_g + BuildDesc="milanf_g-user 13 T2SDS33.75-38-1-3-26 e35d9-fa7d4 release-keys" \ + BuildFingerprint=motorola/milanf_g/milanf:13/T2SDS33.75-38-1-3-26/e35d9-fa7d4:user/release-keys \ + DeviceProduct=milanf_g diff --git a/product.prop b/product.prop index acd8440..cd49666 100644 --- a/product.prop +++ b/product.prop @@ -1,5 +1,5 @@ # Google -ro.opa.device_model_id=motorola-rhodep +ro.opa.device_model_id=motorola-milanf # Motorola ro.mot.build.customerid=global diff --git a/resource-overlay/device/Frameworks/res/values/config.xml b/resource-overlay/device/Frameworks/res/values/config.xml index df86aa1..3e826c6 100644 --- a/resource-overlay/device/Frameworks/res/values/config.xml +++ b/resource-overlay/device/Frameworks/res/values/config.xml @@ -147,7 +147,7 @@ - motog825g + motogstylus5g2022 http://uaprof.motorola.com/phoneconfig/motov1/Profile/motov1.rdf diff --git a/resource-overlay/device/Wifi/res/values/config.xml b/resource-overlay/device/Wifi/res/values/config.xml index 54a1ce4..9af3f65 100644 --- a/resource-overlay/device/Wifi/res/values/config.xml +++ b/resource-overlay/device/Wifi/res/values/config.xml @@ -5,5 +5,5 @@ --> - moto g82 5G + moto g stylus 5G (2022) diff --git a/sensors/Android.bp b/sensors/Android.bp index 7e766dd..9fe5427 100644 --- a/sensors/Android.bp +++ b/sensors/Android.bp @@ -4,7 +4,7 @@ // cc_library_shared { - name: "sensors.rhodep", + name: "sensors.milanf", defaults: ["hidl_defaults"], srcs: [ "Sensor.cpp", @@ -28,7 +28,7 @@ cc_library_shared { "android.hardware.sensors@2.X-multihal", ], cflags: [ - "-DLOG_TAG=\"sensors.rhodep\"", + "-DLOG_TAG=\"sensors.milanf\"", ], vendor: true, } diff --git a/sensors/hals.conf b/sensors/hals.conf index e6a5ee3..9d75cde 100644 --- a/sensors/hals.conf +++ b/sensors/hals.conf @@ -1,3 +1,3 @@ sensors.ssc.so sensors.moto.so -sensors.rhodep.so +sensors.milanf.so