diff --git a/Android.mk b/Android.mk index 2e3dafd..cc151b7 100644 --- a/Android.mk +++ b/Android.mk @@ -6,6 +6,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),umi) +ifeq ($(TARGET_DEVICE),cmi) include $(call all-makefiles-under,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 3a471ff..c0d86e5 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -5,4 +5,4 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_umi.mk + $(LOCAL_DIR)/lineage_cmi.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index ac8f136..646a0b3 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -7,7 +7,7 @@ # Inherit from sm8250-common include device/xiaomi/sm8250-common/BoardConfigCommon.mk -DEVICE_PATH := device/xiaomi/umi +DEVICE_PATH := device/xiaomi/cmi BUILD_BROKEN_DUP_RULES := true @@ -15,14 +15,14 @@ BUILD_BROKEN_DUP_RULES := true TARGET_SCREEN_DENSITY := 440 # Init -TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):init_xiaomi_umi -TARGET_RECOVERY_DEVICE_MODULES := init_xiaomi_umi +TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):init_xiaomi_cmi +TARGET_RECOVERY_DEVICE_MODULES := init_xiaomi_cmi # Kernel -TARGET_KERNEL_CONFIG += vendor/xiaomi/umi.config +TARGET_KERNEL_CONFIG += vendor/xiaomi/cmi.config # OTA assert -TARGET_OTA_ASSERT_DEVICE := umi +TARGET_OTA_ASSERT_DEVICE := cmi # PowerShare SOONG_CONFIG_NAMESPACES += XIAOMI_POWERSHARE @@ -36,4 +36,4 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor # Inherit from the proprietary version -include vendor/xiaomi/umi/BoardConfigVendor.mk +include vendor/xiaomi/cmi/BoardConfigVendor.mk diff --git a/device.mk b/device.mk index a430b0f..4c8e5a3 100644 --- a/device.mk +++ b/device.mk @@ -38,9 +38,9 @@ DEVICE_PACKAGE_OVERLAYS += \ $(LOCAL_PATH)/overlay-lineage PRODUCT_PACKAGES += \ - xiaomi_umi_hwlevel_default_overlay \ - xiaomi_umi_hwlevel_p01_overlay \ - xiaomi_umi_hwlevel_p1_overlay + xiaomi_cmi_hwlevel_default_overlay \ + xiaomi_cmi_hwlevel_p01_overlay \ + xiaomi_cmi_hwlevel_p1_overlay # Permissions PRODUCT_COPY_FILES += \ @@ -62,4 +62,4 @@ PRODUCT_SOONG_NAMESPACES += \ $(LOCAL_PATH) # Inherit from vendor blobs -$(call inherit-product, vendor/xiaomi/umi/umi-vendor.mk) +$(call inherit-product, vendor/xiaomi/cmi/cmi-vendor.mk) diff --git a/extract-files.sh b/extract-files.sh index 50a8d76..56a0b27 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -28,7 +28,7 @@ fi set -e -export DEVICE=umi +export DEVICE=cmi export DEVICE_COMMON=sm8250-common export VENDOR=xiaomi diff --git a/libinit/Android.bp b/libinit/Android.bp index 03f65b5..7acce1d 100644 --- a/libinit/Android.bp +++ b/libinit/Android.bp @@ -5,8 +5,8 @@ // cc_library_static { - name: "init_xiaomi_umi", - srcs: ["init_xiaomi_umi.cpp"], + name: "init_xiaomi_cmi", + srcs: ["init_xiaomi_cmi.cpp"], whole_static_libs: ["//device/xiaomi/sm8250-common:libinit_xiaomi_kona"], include_dirs: ["system/core/init"], recovery_available: true, diff --git a/libinit/init_xiaomi_umi.cpp b/libinit/init_xiaomi_cmi.cpp similarity index 67% rename from libinit/init_xiaomi_umi.cpp rename to libinit/init_xiaomi_cmi.cpp index af8f584..79735c5 100644 --- a/libinit/init_xiaomi_umi.cpp +++ b/libinit/init_xiaomi_cmi.cpp @@ -9,20 +9,20 @@ #include "vendor_init.h" -static const variant_info_t umi_info = { +static const variant_info_t cmi_info = { .hwc_value = "", .sku_value = "", .brand = "Xiaomi", - .device = "umi", + .device = "cmi", .marketname = "", - .model = "Mi 10", - .build_fingerprint = "Xiaomi/umi_global/umi:13/RKQ1.211001.001/V14.0.5.0.TJBMIXM:user/release-keys", + .model = "Mi 10 Pro", + .build_fingerprint = "Xiaomi/cmi_global/cmi:13/RKQ1.211001.001/V14.0.5.0.TJBMIXM:user/release-keys", .nfc = true, }; void vendor_load_properties() { - set_variant_props(umi_info); + set_variant_props(cmi_info); set_dalvik_heap(); } diff --git a/lineage_umi.mk b/lineage_cmi.mk similarity index 67% rename from lineage_umi.mk rename to lineage_cmi.mk index c4d7ccb..cccdb59 100644 --- a/lineage_umi.mk +++ b/lineage_cmi.mk @@ -11,18 +11,18 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # Inherit some common Lineage stuff. $(call inherit-product, vendor/lineage/config/common_full_phone.mk) -# Inherit from umi device -$(call inherit-product, device/xiaomi/umi/device.mk) +# Inherit from cmi device +$(call inherit-product, device/xiaomi/cmi/device.mk) -PRODUCT_NAME := lineage_umi -PRODUCT_DEVICE := umi +PRODUCT_NAME := lineage_cmi +PRODUCT_DEVICE := cmi PRODUCT_MANUFACTURER := Xiaomi PRODUCT_BRAND := Xiaomi -PRODUCT_MODEL := Mi 10 +PRODUCT_MODEL := Mi 10 Pro PRODUCT_GMS_CLIENTID_BASE := android-xiaomi PRODUCT_BUILD_PROP_OVERRIDES += \ - PRIVATE_BUILD_DESC="umi-user 13 RKQ1.211001.001 V14.0.5.0.TJBMIXM release-keys" + PRIVATE_BUILD_DESC="cmi-user 13 RKQ1.211001.001 V14.0.5.0.TJBMIXM release-keys" -BUILD_FINGERPRINT := Xiaomi/umi_global/umi:13/RKQ1.211001.001/V14.0.5.0.TJBMIXM:user/release-keys +BUILD_FINGERPRINT := Xiaomi/cmi_global/cmi:13/RKQ1.211001.001/V14.0.5.0.TJBMIXM:user/release-keys diff --git a/proprietary-files.txt b/proprietary-files.txt index 8d5042d..e1533e9 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,4 +1,4 @@ -# Unpinned blobs from umi-user 13 RKQ1.211001.001 V14.0.5.0.TJBMIXM release-keys +# Unpinned blobs from cmi-user 13 RKQ1.211001.001 V14.0.5.0.TJAMIXM release-keys # ACDB vendor/etc/acdbdata/Tutu/Tutu_Bluetooth_cal.acdb @@ -73,38 +73,42 @@ vendor/lib/libresampler.so vendor/lib/vendor.qti.hardware.audiohalext@1.0.so # Camera -vendor/lib64/camera/com.qti.actuator.umi_dw9800_ov16e10.so -vendor/lib64/camera/com.qti.actuator.umi_gc021m1_macro_dw9714.so +vendor/lib64/camera/com.qti.actuator.cmi_sunny_ultra_dw9800.so +vendor/lib64/camera/com.qti.actuator.cmi_sunny_ultra_dw9800.so +vendor/lib64/camera/com.qti.eeprom.cmi_ofilm_s5k3t2_gt24p64.so +vendor/lib64/camera/com.qti.eeprom.cmi_semco_ov08a10_m24c64.so +vendor/lib64/camera/com.qti.eeprom.cmi_semco_ov08a10_m24c64x.so +vendor/lib64/camera/com.qti.eeprom.cmi_semco_s5k2l7_m24c64x.so +vendor/lib64/camera/com.qti.eeprom.cmi_semco_s5khmx_m24c128.so +vendor/lib64/camera/com.qti.eeprom.cmi_semco_s5khmx_m24c128x.so +vendor/lib64/camera/com.qti.eeprom.cmi_semco_s5khmx_m24c64.so +vendor/lib64/camera/com.qti.eeprom.cmi_sunny_imx350_gt24p64b.so +vendor/lib64/camera/com.qti.eeprom.cmi_sunny_s5k5e8yx_gt24p64.so +vendor/lib64/camera/com.qti.eeprom.hawkeye_semco_ov48c_m24c64x.so vendor/lib64/camera/com.qti.eeprom.truly_cmb433.so -vendor/lib64/camera/com.qti.eeprom.umi_s5k3t2_gt24p64_sunny.so -vendor/lib64/camera/com.qti.eeprom.umi_semco_m24c128x_s5khmx.so -vendor/lib64/camera/com.qti.eeprom.umi_sunny_gc02m1_depth_otp.so -vendor/lib64/camera/com.qti.eeprom.umi_sunny_gc02m1_gt24p64_macro.so -vendor/lib64/camera/com.qti.eeprom.umi_sunny_gt24p64b_ov13b10.so vendor/lib64/camera/com.qti.eeprom.umi_sunny_s5k5e8yx_depth.so +vendor/lib64/camera/com.qti.sensor.cmi_s5k5e8yx_macro.so +vendor/lib64/camera/com.qti.sensor.imx350_cmi.so vendor/lib64/camera/com.qti.sensor.imx563.so -vendor/lib64/camera/com.qti.sensor.ov13b10_umi.so -vendor/lib64/camera/com.qti.sensor.ov16e10.so -vendor/lib64/camera/com.qti.sensor.s5k3t2_umi.so -vendor/lib64/camera/com.qti.sensor.s5khmx.so -vendor/lib64/camera/com.qti.sensor.sunny_s5k5e8yx.so -vendor/lib64/camera/com.qti.sensor.umi_gc02m1_depth.so -vendor/lib64/camera/com.qti.sensor.umi_gc02m1_macro.so -vendor/lib64/camera/com.qti.sensor.umi_sunny_s5k5e8yx_depth.so -vendor/lib64/camera/com.qti.sensormodule.umi_semco_s5khmx.bin -vendor/lib64/camera/com.qti.sensormodule.umi_sunny_gc02m1_depth.bin -vendor/lib64/camera/com.qti.sensormodule.umi_sunny_gc02m1_macro.bin -vendor/lib64/camera/com.qti.sensormodule.umi_sunny_ov13b10.bin -vendor/lib64/camera/com.qti.sensormodule.umi_sunny_ov16e10.bin -vendor/lib64/camera/com.qti.sensormodule.umi_sunny_s5k3t2.bin -vendor/lib64/camera/com.qti.sensormodule.umi_sunny_s5k5e8yx_depth.bin -vendor/lib64/camera/com.qti.sensormodule.umi_sunny_s5k5e8yx_macro.bin +vendor/lib64/camera/com.qti.sensor.ov08a10_cmi.so +vendor/lib64/camera/com.qti.sensor.ov48c_hawkeye.so +vendor/lib64/camera/com.qti.sensor.s5k2l7_cmi.so +vendor/lib64/camera/com.qti.sensor.s5k3t2_cmi.so +vendor/lib64/camera/com.qti.sensor.s5khmx_cmi.so +vendor/lib64/camera/com.qti.sensor.s5khmx_wide_cmi.so +vendor/lib64/camera/com.qti.sensormodule.cmi_ofilm_s5k3t2.bin +vendor/lib64/camera/com.qti.sensormodule.cmi_semco_ov08a10_tele4x_v1.bin +vendor/lib64/camera/com.qti.sensormodule.cmi_semco_s5k2l7_tele2x.bin +vendor/lib64/camera/com.qti.sensormodule.cmi_semco_s5khmx_wide.bin +vendor/lib64/camera/com.qti.sensormodule.cmi_semco_s5khmx_wide_v1.bin +vendor/lib64/camera/com.qti.sensormodule.cmi_sunny_imx350_ultra_wide.bin +vendor/lib64/camera/com.qti.sensormodule.hawkeye_semco_ov48c_wide.bin +vendor/lib64/camera/com.qti.tuned.cmi_ofilm_s5k3t2.bin +vendor/lib64/camera/com.qti.tuned.cmi_semco_ov08a10_tele4x.bin +vendor/lib64/camera/com.qti.tuned.cmi_semco_s5k2l7_tele2x.bin +vendor/lib64/camera/com.qti.tuned.cmi_semco_s5khmx_wide.bin +vendor/lib64/camera/com.qti.tuned.cmi_sunny_imx350_ultra_wide.bin vendor/lib64/camera/com.qti.tuned.default.bin -vendor/lib64/camera/com.qti.tuned.umi_semco_s5khmx.bin -vendor/lib64/camera/com.qti.tuned.umi_sunny_gc02m1_depth.bin -vendor/lib64/camera/com.qti.tuned.umi_sunny_gc02m1_macro.bin -vendor/lib64/camera/com.qti.tuned.umi_sunny_ov13b10.bin -vendor/lib64/camera/com.qti.tuned.umi_sunny_s5k3t2.bin vendor/lib64/camera/fdconfigpreview.bin vendor/lib64/camera/fdconfigpreviewlite.bin vendor/lib64/camera/fdconfigvideo.bin @@ -314,7 +318,6 @@ vendor/etc/camera/112_CyberPunk.png vendor/etc/camera/113_BlackIce.png vendor/etc/camera/CFR_para_HD_V03.bin vendor/etc/camera/CFR_para_T_2x_V03.bin -vendor/etc/camera/CFR_para_UW_V01.bin vendor/etc/camera/CFR_para_W_V03.bin vendor/etc/camera/GpuKernelRepo.pb vendor/etc/camera/LDC_FPC_TUNING_DATA.bin @@ -339,12 +342,10 @@ vendor/etc/camera/almalence_sr_params_wide_64M.config vendor/etc/camera/beauty_ui9_intelligent_params.config vendor/etc/camera/bokehParams.json vendor/etc/camera/camxoverridesettings.txt -vendor/etc/camera/com.xiaomi.dcal.wd.golden +vendor/etc/camera/com.xiaomi.dcal.wt.fake +vendor/etc/camera/com.xiaomi.dcal.wt4x.fake vendor/etc/camera/com.xiaomi.dcal.wu.fake vendor/etc/camera/com.xiaomi.dcal.wu.golden -vendor/etc/camera/deblur_txt_dsp.dlc -vendor/etc/camera/deblur_txt_gpu.dlc -vendor/etc/camera/deblur_txt_npu.dlc vendor/etc/camera/det_quantize.dlc vendor/etc/camera/eisoverridesettings.txt vendor/etc/camera/eyelineblush.cng @@ -355,7 +356,6 @@ vendor/etc/camera/mibokeh_855_opencl.bin vendor/etc/camera/mibokeh_855_parameter.bin vendor/etc/camera/model.dat vendor/etc/camera/model_back.dlc -vendor/etc/camera/model_back_deblur.dlc vendor/etc/camera/model_front.dlc vendor/etc/camera/model_front_mibokeh_video.dlc vendor/etc/camera/reid_float.dlc @@ -365,8 +365,11 @@ vendor/etc/camera/vidhance_calibration # Camera firmware vendor/firmware/CAMERA_ICP.elf -vendor/firmware/umi_ois.coeff -vendor/firmware/umi_ois.prog +vendor/firmware/cmi_tele4x_ois.coeff +vendor/firmware/cmi_tele4x_ois.mem +vendor/firmware/cmi_tele4x_ois.prog +vendor/firmware/cmi_wide_ois.coeff +vendor/firmware/cmi_wide_ois.prog # Charger (HVDCP) vendor/bin/hvdcp_opti @@ -379,7 +382,6 @@ vendor/bin/batterysecret vendor/etc/init/init.batterysecret.rc # Fingerprint -vendor/lib64/hw/fingerprint.fpc_fod.so:vendor/lib64/hw/fingerprint.fpc_fod.default.so vendor/lib64/hw/fingerprint.goodix_fod.so:vendor/lib64/hw/fingerprint.goodix_fod.default.so vendor/lib64/libgf_hal.so @@ -608,5 +610,4 @@ vendor/etc/thermald-devices.conf # Vibrator firmware vendor/firmware/aw8697_haptic.bin -vendor/firmware/aw8697_haptic_a.bin vendor/firmware/aw8697_rtp_1.bin diff --git a/rro_overlays/xiaomi_umi_hwlevel_default_overlay/Android.bp b/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/Android.bp similarity index 60% rename from rro_overlays/xiaomi_umi_hwlevel_default_overlay/Android.bp rename to rro_overlays/xiaomi_cmi_hwlevel_default_overlay/Android.bp index 6c77c16..0b1e814 100644 --- a/rro_overlays/xiaomi_umi_hwlevel_default_overlay/Android.bp +++ b/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "xiaomi_umi_hwlevel_default_overlay", + name: "xiaomi_cmi_hwlevel_default_overlay", sdk_version: "current", vendor: true } diff --git a/rro_overlays/xiaomi_umi_hwlevel_default_overlay/AndroidManifest.xml b/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/AndroidManifest.xml similarity index 83% rename from rro_overlays/xiaomi_umi_hwlevel_default_overlay/AndroidManifest.xml rename to rro_overlays/xiaomi_cmi_hwlevel_default_overlay/AndroidManifest.xml index 0d7b827..64eea0a 100644 --- a/rro_overlays/xiaomi_umi_hwlevel_default_overlay/AndroidManifest.xml +++ b/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/AndroidManifest.xml @@ -1,5 +1,5 @@ diff --git a/rro_overlays/xiaomi_umi_hwlevel_default_overlay/res/values/config.xml b/rro_overlays/xiaomi_cmi_hwlevel_default_overlay/res/values/config.xml similarity index 100% rename from rro_overlays/xiaomi_umi_hwlevel_default_overlay/res/values/config.xml rename to rro_overlays/xiaomi_cmi_hwlevel_default_overlay/res/values/config.xml diff --git a/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/Android.bp b/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/Android.bp similarity index 62% rename from rro_overlays/xiaomi_umi_hwlevel_p01_overlay/Android.bp rename to rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/Android.bp index ebf8012..1333ccb 100644 --- a/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/Android.bp +++ b/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "xiaomi_umi_hwlevel_p01_overlay", + name: "xiaomi_cmi_hwlevel_p01_overlay", sdk_version: "current", vendor: true } diff --git a/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/AndroidManifest.xml b/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/AndroidManifest.xml similarity index 87% rename from rro_overlays/xiaomi_umi_hwlevel_p01_overlay/AndroidManifest.xml rename to rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/AndroidManifest.xml index 09dd00e..b3437fa 100644 --- a/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/AndroidManifest.xml +++ b/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/AndroidManifest.xml @@ -1,5 +1,5 @@ diff --git a/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/res/values/config.xml b/rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/res/values/config.xml similarity index 100% rename from rro_overlays/xiaomi_umi_hwlevel_p01_overlay/res/values/config.xml rename to rro_overlays/xiaomi_cmi_hwlevel_p01_overlay/res/values/config.xml diff --git a/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/Android.bp b/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/Android.bp similarity index 63% rename from rro_overlays/xiaomi_umi_hwlevel_p1_overlay/Android.bp rename to rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/Android.bp index f222629..d516b38 100644 --- a/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/Android.bp +++ b/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/Android.bp @@ -1,5 +1,5 @@ runtime_resource_overlay { - name: "xiaomi_umi_hwlevel_p1_overlay", + name: "xiaomi_cmi_hwlevel_p1_overlay", sdk_version: "current", vendor: true } diff --git a/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/AndroidManifest.xml b/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/AndroidManifest.xml similarity index 87% rename from rro_overlays/xiaomi_umi_hwlevel_p1_overlay/AndroidManifest.xml rename to rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/AndroidManifest.xml index 4e2e903..371bcd9 100644 --- a/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/AndroidManifest.xml +++ b/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/AndroidManifest.xml @@ -1,5 +1,5 @@ diff --git a/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/res/values/config.xml b/rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/res/values/config.xml similarity index 100% rename from rro_overlays/xiaomi_umi_hwlevel_p1_overlay/res/values/config.xml rename to rro_overlays/xiaomi_cmi_hwlevel_p1_overlay/res/values/config.xml diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 5cc2e99..f2c195d 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -8,7 +8,7 @@ set -e -export DEVICE=umi +export DEVICE=cmi export DEVICE_COMMON=sm8250-common export VENDOR=xiaomi