From d0c47c3333d305d93e44cd30db3c617608a07aa0 Mon Sep 17 00:00:00 2001
From: Sebastiano Barezzi <barezzisebastiano@gmail.com>
Date: Sun, 11 Sep 2022 22:17:23 +0200
Subject: [PATCH] whyred: Reorder BoardConfig.mk and device.mk

Change-Id: I9dc60630a6edfcc4896cd8e4f42babaa43626a37
---
 BoardConfig.mk |  7 ++++---
 device.mk      | 16 ++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index e8fdd8b..b788566 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -22,9 +22,7 @@ TARGET_SCREEN_DENSITY := 440
 # Kernel
 TARGET_KERNEL_CONFIG += xiaomi/whyred.config
 
-# Manifest
-DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
-
+# Partitions
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
 BOARD_VENDORIMAGE_PARTITION_SIZE := 838860800
 
@@ -37,5 +35,8 @@ TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
 # Security patch level
 VENDOR_SECURITY_PATCH := 2018-11-01
 
+# VINTF
+DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
+
 # Inherit the proprietary files
 include vendor/xiaomi/whyred/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 93dbdf7..bff8ace 100644
--- a/device.mk
+++ b/device.mk
@@ -17,13 +17,14 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \
     $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml
 
-# Consumerir
-BOARD_HAVE_IR := true
+# Camera
+PRODUCT_PACKAGES += \
+    libcamera_sdm660_shim
 
 # FM
 BOARD_HAVE_QCOM_FM := true
 
-# Gatekeeper HAL
+# Gatekeeper
 PRODUCT_PACKAGES += \
     android.hardware.gatekeeper@1.0-impl \
     android.hardware.gatekeeper@1.0-service
@@ -32,6 +33,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     vendor.qti.hardware.cryptfshw@1.0-service-qti.qsee
 
+# IR
+BOARD_HAVE_IR := true
+
 # Keymaster
 PRODUCT_PACKAGES += \
     android.hardware.keymaster@3.0-impl \
@@ -42,15 +46,11 @@ DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay \
     $(LOCAL_PATH)/overlay-lineage
 
-# Ramdisk
+# Rootdir
 PRODUCT_PACKAGES += \
     fstab.qcom \
     init.device.rc
 
-# Shims
-PRODUCT_PACKAGES += \
-    libcamera_sdm660_shim
-
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.0-service.basic