sm8550-common: Birth of xiaomi-sm8550-common

 * lets just do the absolute minimum, we can decommonize more later if needed

Change-Id: I30340fb04ff335c1b5a1322bfc3d4dda24d5aad3

Android.mk

@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2023 Paranoid Android
+# Copyright (C) 2023-2024 Paranoid Android
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter xiaomi13,$(TARGET_DEVICE)),)
+ifneq ($(filter fuxi nuwa,$(TARGET_DEVICE)),)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
 

BoardConfig.mk → BoardConfigCommon.mk

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PATH := device/xiaomi/xiaomi13
+COMMON_PATH := device/xiaomi/sm8550-common
 
 # A/B
 AB_OTA_UPDATER := true
@@ -46,33 +46,27 @@ SOONG_CONFIG_ufsbsg += ufsframework
 SOONG_CONFIG_ufsbsg_ufsframework := bsg
 
 # Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := kalama
+TARGET_BOOTLOADER_BOARD_NAME ?= kalama
 TARGET_NO_BOOTLOADER := true
 
 # Build
 BUILD_BROKEN_DUP_RULES := true
 BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
 
-# Display
-TARGET_SCREEN_DENSITY := 420
-
 # DTB
 BOARD_INCLUDE_DTB_IN_BOOTIMG := true
 
-# Filesystem
-TARGET_FS_CONFIG_GEN += $(DEVICE_PATH)/configs/config.fs
-
 # HIDL
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \
-    $(DEVICE_PATH)/configs/vintf/framework_matrix_xiaomi.xml
+    $(COMMON_PATH)/configs/vintf/framework_matrix_xiaomi.xml
 
 DEVICE_MANIFEST_FILE += \
-    $(DEVICE_PATH)/configs/vintf/manifest_kalama.xml \
-    $(DEVICE_PATH)/configs/vintf/manifest_xiaomi.xml
+    $(COMMON_PATH)/configs/vintf/manifest_kalama.xml \
+    $(COMMON_PATH)/configs/vintf/manifest_xiaomi.xml
 
 # Init
-TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_xiaomi13
-TARGET_RECOVERY_DEVICE_MODULES := libinit_xiaomi13
+TARGET_INIT_VENDOR_LIB := //$(COMMON_PATH):libinit_xiaomi_sm8550
+TARGET_RECOVERY_DEVICE_MODULES := libinit_xiaomi_sm8550
 
 # Kernel
 BOARD_BOOTCONFIG := \
@@ -95,14 +89,11 @@ TARGET_HAS_GENERIC_KERNEL_HEADERS := true
 TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_BYPASS := false
 
 # Kernel Modules
-BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.recovery))
+BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(COMMON_PATH)/modules.load.recovery))
 
 # Metadata
 BOARD_USES_METADATA_PARTITION := true
 
-# OTA
-TARGET_OTA_ASSERT_DEVICE := fuxi|nuwa
-
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 201326592
 BOARD_DTBOIMG_PARTITION_SIZE := 25165824
@@ -136,22 +127,22 @@ TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm
 TARGET_POWERSHARE_NODE := /sys/class/qcom-battery/reverse_chg_mode
 
 # Properties
-TARGET_ODM_PROP += $(DEVICE_PATH)/configs/properties/odm.prop
-TARGET_SYSTEM_PROP += $(DEVICE_PATH)/configs/properties/system.prop
-TARGET_VENDOR_PROP += $(DEVICE_PATH)/configs/properties/vendor.prop
+TARGET_ODM_PROP += $(COMMON_PATH)/configs/properties/odm.prop
+TARGET_SYSTEM_PROP += $(COMMON_PATH)/configs/properties/system.prop
+TARGET_VENDOR_PROP += $(COMMON_PATH)/configs/properties/vendor.prop
 
 # Recovery
 BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE := true
-TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/init/fstab.qcom
+TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/init/fstab.qcom
 TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 80
 TARGET_USERIMAGES_USE_F2FS := true
 
 # SELinux
 include device/xiaomi/sepolicy/SEPolicy.mk
-BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private
-SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/public
+BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/private
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/public
 
 # Sensors
 SOONG_CONFIG_NAMESPACES += SENSORS_XIAOMI

README.md

@@ -1,85 +1,18 @@
-Device configuration for Xiaomi 13 (Pro)
-=========================================
+# Common device configuration for Xiaomi 8550 family
 
-The Xiaomi 13 (Pro) is a flagship phone from Xiaomi.
+## Currently supported devices:
 
-It was released in Decenber 2022.
+- Xiaomi 13 (fuxi)
+- Xiaomi 13 Pro (nuwa)
 
-## Device specifications
+## Currently supported SoCs
 
-<table>
-    <tbody>
-        <tr>
-            <td>Basic</td>
-            <td colspan="2">Spec Sheet</td>
-        </tr>
-        <tr>
-            <td>Model</td>
-            <td>Xiaomi 13</td>
-            <td>Xiaomi 13 Pro</td>
-        </tr>
-        <tr>
-            <td>SoC</td>
-            <td colspan="2">Qualcomm SM8550-AB Snapdragon 8 Gen 2 (4 nm)</td>
-        </tr>
-        <tr>
-            <td>CPU</td>
-            <td colspan="2">Octa-core (1x3.2 GHz Cortex-X3 &amp; 2x2.8 GHz Cortex-A715 &amp; 2x2.8 GHz Cortex-A710 &amp; 3x2.0 GHz Cortex-A510)</td>
-        </tr>
-        <tr>
-            <td>GPU</td>
-            <td colspan="2">Adreno 740</td>
-        </tr>
-        <tr>
-            <td>Memory</td>
-            <td colspan="2">128GB 8GB RAM, 256GB 8GB RAM, 256GB 12GB RAM, 512GB 12GB RAM</td>
-        </tr>
-        <tr>
-            <td>Shipped Android Version</td>
-            <td colspan="2">Android 13</td>
-        </tr>
-        <tr>
-            <td>Battery</td>
-            <td>Li-Po 4500 mAh, non-removable</td>
-            <td>Li-Po 4820 mAh, non-removable</td>
-        </tr>
-        <tr>
-            <td>Display</td>
-            <td>1080 x 2400 pixels, 20:9 ratio (~414 ppi density), AMOLED, 120Hz, Dolby Vision, HDR10+, 1200 nits (HBM), 1900 nits (peak)</td>
-            <td>1440 x 3200 pixels, 20:9 ratio (~522 ppi density), LTPO AMOLED, 1B colors, 120Hz, Dolby Vision, HDR10+, 1200 nits (HBM), 1900 nits (peak)</td>
-        </tr>
-        <tr>
-            <td>Camera (Wide)</td>
-            <td>50 MP, f/1.8, 23mm (wide), 1/1.49", 1.0&micro;m, PDAF, OIS</td>
-            <td>50.3 MP, f/1.9, 23mm (wide), 1.0"-type, 1.6&micro;m, Dual Pixel PDAF, Laser AF, OIS</td>
-        </tr>
-        <tr>
-            <td>Camera (Ultrawide)</td>
-            <td>12 MP, f/2.2, 15mm, 120˚ (ultrawide), 1/3.06", 1.12&micro;m</td>
-            <td>50 MP, f/2.2, 14mm, 115˚ (ultrawide), AF&nbsp;</td>
-        </tr>
-        <tr>
-            <td>Camera (Tele)</td>
-            <td>10 MP, f/2.0, 75mm (telephoto), 1/3.75", 1.0&micro;m, PDAF, OIS, 3.2x optical zoom</td>
-            <td>50 MP, f/2.0, 75mm (telephoto), PDAF (10cm - &infin;), 3.2x optical zoom</td>
-        </tr>
-        <tr>
-            <td>Camera (Front)</td>
-            <td colspan="2">32 MP,&nbsp;f/2.0, 22mm (wide), 1/3.14", 0.7&micro;m</td>
-        </tr>
-    </tbody>
-</table>
-
-## Device picture
-
-![fuxi/nuwa](https://www.notebookcheck.com/fileadmin/Notebooks/News/_nc3/Xiaomi_13_Pro_globaler_Launchtermin.jpg "fuxi/nuwa")
+- SM8550 (kalama)
 
 ## Copyright
 
 ```
-#
-# Copyright (C) 2023 Paranoid Android
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-```
+Copyright (C) 2024 Paranoid Android
+
+SPDX-License-Identifier: Apache-2.0
+```

device.mk → common.mk

@@ -14,7 +14,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
 $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
 
 # Get non-open-source specific aspects
-$(call inherit-product, vendor/xiaomi/xiaomi13/xiaomi13-vendor.mk)
+$(call inherit-product, vendor/xiaomi/sm8550-common/sm8550-common-vendor.mk)
 
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
@@ -101,10 +101,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     [email protected]
 
-# Boot Animation
-PRODUCT_COPY_FILES += \
-    vendor/aospa/bootanimation/1440/bootanimation.zip:$(TARGET_COPY_OUT_ODM)/overlayfs/nuwa/product/media/bootanimation.zip
-
 # Boot Control
 PRODUCT_PACKAGES += \
     [email protected] \
@@ -194,7 +190,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     fstab.qcom \
     init.target.rc \
-    init.mi_overlay.rc \
     init.mi_perf.rc \
     init.mi_service.rc \
     init.mi_udfps.rc \
@@ -203,9 +198,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/init/fstab.qcom:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.qcom
 
-# Kernel Binary
-KERNEL_PREBUILT_DIR := device/xiaomi/xiaomi13-kernel
-
 # Keymaster
 PRODUCT_PACKAGES += \
     [email protected] \
@@ -293,32 +285,17 @@ PRODUCT_COPY_FILES += \
 
 # Overlays
 PRODUCT_PACKAGES += \
-    Xiaomi13CarrierConfigRes \
-    Xiaomi13CarrierConfigResMiui \
-    Xiaomi13DolbyFuxi \
-    Xiaomi13Frameworks \
-    Xiaomi13FrameworksAOSPA \
-    Xiaomi13FrameworksFuxi \
-    Xiaomi13FrameworksNuwa \
-    Xiaomi13Nfc \
-    Xiaomi13SecureElement \
-    Xiaomi13Settings \
-    Xiaomi13Settings2210132C \
-    Xiaomi13Settings2210132G \
-    Xiaomi13Settings2211133C \
-    Xiaomi13Settings2211133G \
-    Xiaomi13SettingsProviderFuxi \
-    Xiaomi13SettingsProviderNuwa \
-    Xiaomi13SystemUI \
-    Xiaomi13SystemUIAOSPA \
-    Xiaomi13SystemUIFuxi \
-    Xiaomi13SystemUINuwa \
-    Xiaomi13WifiRes \
-    Xiaomi13WifiResMainline \
-    Xiaomi13WifiResFuxi \
-    Xiaomi13WifiResFuxiMainline \
-    Xiaomi13WifiResNuwa \
-    Xiaomi13WifiResNuwaMainline
+    Xiaomi8550CarrierConfigRes \
+    Xiaomi8550CarrierConfigResMiui \
+    Xiaomi8550Frameworks \
+    Xiaomi8550FrameworksAOSPA \
+    Xiaomi8550Nfc \
+    Xiaomi8550SecureElement \
+    Xiaomi8550Settings \
+    Xiaomi8550SystemUI \
+    Xiaomi8550SystemUIAOSPA \
+    Xiaomi8550WifiRes \
+    Xiaomi8550WifiResMainline \
 
 # Parts
 PRODUCT_PACKAGES += \
@@ -332,11 +309,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     vendor.aospa.powershare-service
 
-# Properties
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/properties/odm_fuxi.prop:$(TARGET_COPY_OUT_ODM)/etc/build_fuxi.prop \
-    $(LOCAL_PATH)/configs/properties/odm_nuwa.prop:$(TARGET_COPY_OUT_ODM)/etc/build_nuwa.prop
-
 # QMI
 PRODUCT_PACKAGES += \
     libjson
@@ -353,7 +325,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \
     frameworks/native/data/etc/android.hardware.sensor.ambient_temperature.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.ambient_temperature.xml \
-    frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_nuwa/android.hardware.sensor.barometer.xml \
     frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \
     frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \
     frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.hifi_sensors.xml \
@@ -412,4 +383,4 @@ PRODUCT_COPY_FILES += \
 # WiFi Display
 PRODUCT_PACKAGES += \
     libnl \
-    libwfdaac_vendor
+    libwfdaac_vendor