diff --git a/Android.bp b/Android.bp
index 50756a0..162fa1c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,10 +1,9 @@
+//
 // Automatically generated file. DO NOT MODIFY
 //
-// This file is generated by device/oneplus/dumpling/setup-makefiles.sh
 
 soong_namespace {
-	imports: [
-		"vendor/oneplus/msm8998-common",
-	],
+    imports: [
+        "vendor/oneplus/msm8998-common",
+    ],
 }
-
diff --git a/Android.mk b/Android.mk
index a5ab8e4..f5af3af 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,21 +1,21 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/oneplus/dumpling/setup-makefiles.sh
 
 LOCAL_PATH := $(call my-dir)
 
 ifeq ($(TARGET_DEVICE),dumpling)
 
-$(call add-radio-file-sha1-checked,radio/bluetooth.img,d28f140f0910e53a7df854c4badc5b8f26792b9c)
-$(call add-radio-file-sha1-checked,radio/modem.img,04b915ea16e59ff173d799b564431814a83384d4)
+$(call add-radio-file-sha1-checked,radio/LOGO.img,2b932fbe792a423a6d0dff2fbe3e1083753b49b6)
 $(call add-radio-file-sha1-checked,radio/abl.img,61a61abefa3cd01c29840381a0920a9436cfca80)
-$(call add-radio-file-sha1-checked,radio/dsp.img,9efd0c326cd631cdbeed4678cfafafd5265a9e73)
+$(call add-radio-file-sha1-checked,radio/bluetooth.img,d28f140f0910e53a7df854c4badc5b8f26792b9c)
 $(call add-radio-file-sha1-checked,radio/cmnlib.img,b1d40c00595ee11d4bb5576c460ff9aa4081ae05)
 $(call add-radio-file-sha1-checked,radio/cmnlib64.img,f71e7486871c46ecc9d985ca16a4e77acae4ab65)
 $(call add-radio-file-sha1-checked,radio/devcfg.img,0c33f2b0bec151549afbd1a8c3b5fc165e71deab)
+$(call add-radio-file-sha1-checked,radio/dsp.img,9efd0c326cd631cdbeed4678cfafafd5265a9e73)
 $(call add-radio-file-sha1-checked,radio/hyp.img,8bf0aac2ede796b15a41a4d052ee4a14d7d8f96d)
 $(call add-radio-file-sha1-checked,radio/keymaster.img,76d90cb75a00913aa12891890ac2541841a15f25)
-$(call add-radio-file-sha1-checked,radio/LOGO.img,2b932fbe792a423a6d0dff2fbe3e1083753b49b6)
+$(call add-radio-file-sha1-checked,radio/modem.img,04b915ea16e59ff173d799b564431814a83384d4)
 $(call add-radio-file-sha1-checked,radio/pmic.img,6cd1aaf0dabdab9726740a3b373c2304437f3d57)
 $(call add-radio-file-sha1-checked,radio/rpm.img,452ec092b517710210c518600b94beb3b3636c14)
 $(call add-radio-file-sha1-checked,radio/tz.img,27d5845d4e2d266c0d841c48f4a49333717af5c7)
diff --git a/BoardConfigVendor.mk b/BoardConfigVendor.mk
index d571964..18ed0ae 100644
--- a/BoardConfigVendor.mk
+++ b/BoardConfigVendor.mk
@@ -1,4 +1,3 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/oneplus/dumpling/setup-makefiles.sh
-
diff --git a/dumpling-vendor.mk b/dumpling-vendor.mk
index 24565a4..90159db 100644
--- a/dumpling-vendor.mk
+++ b/dumpling-vendor.mk
@@ -1,6 +1,6 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/oneplus/dumpling/setup-makefiles.sh
 
 PRODUCT_SOONG_NAMESPACES += \
     vendor/oneplus/dumpling
@@ -17,13 +17,13 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/dumpling/proprietary/vendor/etc/acdbdata/adsp_avs_config.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/adsp_avs_config.acdb \
     vendor/oneplus/dumpling/proprietary/vendor/etc/camera/imx376k_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/imx376k_chromatix.xml \
     vendor/oneplus/dumpling/proprietary/vendor/etc/camera/imx398_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/imx398_chromatix.xml \
-    vendor/oneplus/dumpling/proprietary/vendor/firmware/tfa98xx.cnt:$(TARGET_COPY_OUT_VENDOR)/firmware/tfa98xx.cnt \
     vendor/oneplus/dumpling/proprietary/vendor/etc/oneplus5T_vstab_db_1080p_video_0_30fps.config:$(TARGET_COPY_OUT_VENDOR)/etc/oneplus5T_vstab_db_1080p_video_0_30fps.config \
     vendor/oneplus/dumpling/proprietary/vendor/etc/oneplus5T_vstab_db_1080p_video_0_60fps.config:$(TARGET_COPY_OUT_VENDOR)/etc/oneplus5T_vstab_db_1080p_video_0_60fps.config \
     vendor/oneplus/dumpling/proprietary/vendor/etc/oneplus5T_vstab_db_1080p_video_1_30fps.config:$(TARGET_COPY_OUT_VENDOR)/etc/oneplus5T_vstab_db_1080p_video_1_30fps.config \
     vendor/oneplus/dumpling/proprietary/vendor/etc/oneplus5T_vstab_db_4k_video_0_30fps.config:$(TARGET_COPY_OUT_VENDOR)/etc/oneplus5T_vstab_db_4k_video_0_30fps.config \
     vendor/oneplus/dumpling/proprietary/vendor/etc/oneplus5T_vstab_db_720p_video_0_30fps.config:$(TARGET_COPY_OUT_VENDOR)/etc/oneplus5T_vstab_db_720p_video_0_30fps.config \
     vendor/oneplus/dumpling/proprietary/vendor/etc/oneplus5T_vstab_db_720p_video_1_30fps.config:$(TARGET_COPY_OUT_VENDOR)/etc/oneplus5T_vstab_db_720p_video_1_30fps.config \
+    vendor/oneplus/dumpling/proprietary/vendor/firmware/tfa98xx.cnt:$(TARGET_COPY_OUT_VENDOR)/firmware/tfa98xx.cnt \
     vendor/oneplus/dumpling/proprietary/vendor/lib/hw/camera.msm8998.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/camera.msm8998.so \
     vendor/oneplus/dumpling/proprietary/vendor/lib/libactuator_lc898217xc_imx376k.so:$(TARGET_COPY_OUT_VENDOR)/lib/libactuator_lc898217xc_imx376k.so \
     vendor/oneplus/dumpling/proprietary/vendor/lib/libchromatix_imx376k_3a_1840x1380_30fps_preview_bokeh.so:$(TARGET_COPY_OUT_VENDOR)/lib/libchromatix_imx376k_3a_1840x1380_30fps_preview_bokeh.so \