Merge branch lineage-21 from LineageOS into fourteen

lmodroid_mars.mk

@@ -21,12 +21,12 @@ PRODUCT_MODEL := M2102K1AC
 PRODUCT_NAME := lmodroid_mars
 
 PRODUCT_GMS_CLIENTID_BASE := android-xiaomi
-PRODUCT_SYSTEM_NAME := mars
+PRODUCT_SYSTEM_NAME := mars_global
 PRODUCT_SYSTEM_DEVICE := mars
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRIVATE_BUILD_DESC="mars-user 13 RKQ1.211001.001 V816.0.2.0.UKACNXM release-keys" \
+    PRIVATE_BUILD_DESC="mars_global-user 13 RKQ1.211001.001 V816.0.2.0.UKAMIXM release-keys" \
     TARGET_DEVICE=$(PRODUCT_SYSTEM_DEVICE) \
     TARGET_PRODUCT=$(PRODUCT_SYSTEM_NAME)
 
-BUILD_FINGERPRINT := Xiaomi/mars/mars:13/RKQ1.211001.001/V816.0.2.0.UKACNXM:user/release-keys
+BUILD_FINGERPRINT := Xiaomi/mars_global/mars:13/RKQ1.211001.001/V816.0.2.0.UKAMIXM:user/release-keys

proprietary-files.txt

-# These proprietary files are extracted from star OS1.0.2.0.UKACNXM, note the pinned blobs
+# These proprietary files are extracted from star OS1.0.2.0.UKAMIXM, note the pinned blobs
 
 # ACDB
 vendor/etc/acdbdata/Tutu/Tutu_Bluetooth_cal.acdb

proprietary-firmware.txt

 ## All proprietary files from this list, unless pinned and noted otherwise,
-## are from miui_STARGlobal_V14.0.5.0.TKAMIXM
+## are from star OS1.0.2.0.UKAMIXM
 
 abl.img;AB
 aop.img;AB