surya: Sync extract scripts with templates

Android.bp

@@ -1214,7 +1214,7 @@ cc_prebuilt_library_shared {
 		none: true,
 	},
 	target: {
-		android_arm: {
+		: {
 			srcs: ["proprietary/vendor/lib/libMpeg4SwEncoder.so"],
 		},
 	},
@@ -1265,7 +1265,7 @@ cc_prebuilt_library_shared {
 		none: true,
 	},
 	target: {
-		android_arm: {
+		: {
 			srcs: ["proprietary/vendor/lib/libOmxAlacDecSw.so"],
 		},
 	},
@@ -1333,7 +1333,7 @@ cc_prebuilt_library_shared {
 		none: true,
 	},
 	target: {
-		android_arm: {
+		: {
 			srcs: ["proprietary/vendor/lib/libOmxApeDecSw.so"],
 		},
 	},
@@ -1401,7 +1401,7 @@ cc_prebuilt_library_shared {
 		none: true,
 	},
 	target: {
-		android_arm: {
+		: {
 			srcs: ["proprietary/vendor/lib/libOmxSwVdec.so"],
 		},
 	},
@@ -1418,7 +1418,7 @@ cc_prebuilt_library_shared {
 		none: true,
 	},
 	target: {
-		android_arm: {
+		: {
 			srcs: ["proprietary/vendor/lib/libOmxSwVencMpeg4.so"],
 		},
 	},
@@ -1622,7 +1622,7 @@ cc_prebuilt_library_shared {
 		none: true,
 	},
 	target: {
-		android_arm: {
+		: {
 			srcs: ["proprietary/vendor/lib/libpn553_fw.so"],
 		},
 	},
@@ -1690,7 +1690,7 @@ cc_prebuilt_library_shared {
 		none: true,
 	},
 	target: {
-		android_arm: {
+		: {
 			srcs: ["proprietary/vendor/lib/libswvdec.so"],
 		},
 	},
@@ -1717,24 +1717,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libmisoundfx",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/soundfx/libmisoundfx.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	relative_install_path: "soundfx",
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libshoebox",
 	owner: "xiaomi",
@@ -8656,7 +8638,7 @@ dex_import {
 }
 
 prebuilt_etc_xml {
-	name: "manifest_android.hardware.drm@1.3-service.widevine",
+	name: "manifest_android.hardware.drm@1.3-service.widevine.xml",
 	owner: "xiaomi",
 	src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml",
 	filename_from_src: true,
@@ -8665,7 +8647,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "vendor.qti.gnss@4.0-service",
+	name: "vendor.qti.gnss@4.0-service.xml",
 	owner: "xiaomi",
 	src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml",
 	filename_from_src: true,

Android.mk

@@ -6,23 +6,23 @@ LOCAL_PATH := $(call my-dir)
 
 ifeq ($(TARGET_DEVICE),surya)
 
-$(call add-radio-file-sha1-checked,radio/BTFM.bin,9051f947997f7e418ab574ffd87184565430a1ba)
-$(call add-radio-file-sha1-checked,radio/NON-HLOS.bin,b689d1f9b96795285e6ce829483ed3d87a999a01)
-$(call add-radio-file-sha1-checked,radio/abl.elf,e8df545c936135131c57d0925779b64ba9539a0c)
-$(call add-radio-file-sha1-checked,radio/aop.mbn,2341652f2235e9a62680dd386ee2e0b432b8b715)
-$(call add-radio-file-sha1-checked,radio/cmnlib.mbn,7aaf9ff856afcf07f21ea30baa87794a3fbdfcdc)
-$(call add-radio-file-sha1-checked,radio/cmnlib64.mbn,7b0c7f4004cabf1b73c0a483c5dff061b7f1fd56)
-$(call add-radio-file-sha1-checked,radio/devcfg.mbn,90e1a1fdd8c51125075a20ac500ed16ab8c2db6c)
-$(call add-radio-file-sha1-checked,radio/dspso.bin,fa7ef222aa1ecc6d8c0d6dd7180f4d31b95a240e)
-$(call add-radio-file-sha1-checked,radio/ffu.img,a9e9a15e94f59222fe11991221cf59eede39159e)
-$(call add-radio-file-sha1-checked,radio/hyp.mbn,7bc88b2bcdbeaf98e6d981dcef69ae79f52437cd)
-$(call add-radio-file-sha1-checked,radio/imagefv.elf,1e65b32e156efed462b4d783391d3d73ff509ad4)
-$(call add-radio-file-sha1-checked,radio/km4.mbn,267f2d0bd47006ab247cd4c27837cdfa1d4c33df)
-$(call add-radio-file-sha1-checked,radio/qupv3fw.elf,d5413bbcfbc3d3257a336348051e6743650b9a4b)
-$(call add-radio-file-sha1-checked,radio/storsec.mbn,c85e32f913ad176b8bc8bfd7f6a245bca32a2ce7)
-$(call add-radio-file-sha1-checked,radio/tz.mbn,314b454a78ea59c7ff2c03157d430ad3bc5ee20e)
-$(call add-radio-file-sha1-checked,radio/uefi_sec.mbn,b572f7e8a86b25932118e325ac4612ad7c941cc2)
-$(call add-radio-file-sha1-checked,radio/xbl.elf,24ce1f6d6cd52fd649ddf89e165dbf073ffc2050)
-$(call add-radio-file-sha1-checked,radio/xbl_config.elf,37d04a1188528975ae347f33efb26d684baced2c)
+$(call add-radio-file-sha1-checked,radio/BTFM.bin,)
+$(call add-radio-file-sha1-checked,radio/NON-HLOS.bin,)
+$(call add-radio-file-sha1-checked,radio/abl.elf,dbbc32e89ca68a60436c3e854405a8b1efeb8fcf)
+$(call add-radio-file-sha1-checked,radio/aop.mbn,a882a33ee29f3ab2bc31e7acb79097b887fcef1b)
+$(call add-radio-file-sha1-checked,radio/cmnlib.mbn,5529386716c6202fd22499c1f2501fef393c9876)
+$(call add-radio-file-sha1-checked,radio/cmnlib64.mbn,1cfa661df1bd4c5553a897d5efcc1e5c576473ce)
+$(call add-radio-file-sha1-checked,radio/devcfg.mbn,d7c307c8806ac25d255a955f7735e1ff6c7e3c0e)
+$(call add-radio-file-sha1-checked,radio/dspso.bin,)
+$(call add-radio-file-sha1-checked,radio/ffu.img,f1e5f71fa958f200a58e4a33047855da3730a34f)
+$(call add-radio-file-sha1-checked,radio/hyp.mbn,d09950017f0c2b742632e77e7299dbfb49ae90de)
+$(call add-radio-file-sha1-checked,radio/imagefv.elf,94f4994f6fafa28b1cd0dbde03d9187598d8fdd6)
+$(call add-radio-file-sha1-checked,radio/km4.mbn,)
+$(call add-radio-file-sha1-checked,radio/qupv3fw.elf,)
+$(call add-radio-file-sha1-checked,radio/storsec.mbn,50c976ea8529037508a3d82c854ed52cee8edbcd)
+$(call add-radio-file-sha1-checked,radio/tz.mbn,430fdf5932313c3950c21f1e1ebe9999aa2e4486)
+$(call add-radio-file-sha1-checked,radio/uefi_sec.mbn,)
+$(call add-radio-file-sha1-checked,radio/xbl.elf,a9fef573654bab498a953b9d8f8b7e7bdeef0f0a)
+$(call add-radio-file-sha1-checked,radio/xbl_config.elf,db11157c3ffb64b7b3b1752b4d3683e42475a385)
 
 endif

surya-vendor.mk

@@ -217,7 +217,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/surya/proprietary/vendor/firmware/novatek_ts_tianma_mp.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/novatek_ts_tianma_mp.bin \
     vendor/xiaomi/surya/proprietary/vendor/firmware/osc_rtp_24K_5s.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/osc_rtp_24K_5s.bin \
     vendor/xiaomi/surya/proprietary/vendor/firmware/tas256x_reg.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/tas256x_reg.bin \
-    vendor/xiaomi/surya/proprietary/vendor/lib/rfsa/adsp/misound_res.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/misound_res.bin \
     vendor/xiaomi/surya/proprietary/vendor/lib/rfsa/adsp/tas25xx_TI_0.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/tas25xx_TI_0.bin \
     vendor/xiaomi/surya/proprietary/vendor/lib/rfsa/adsp/tas25xx_TI_1.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/tas25xx_TI_1.bin \
     vendor/xiaomi/surya/proprietary/vendor/lib64/camera/com.qti.sensormodule.j20c_aac_gc02m1b_depth.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensormodule.j20c_aac_gc02m1b_depth.bin \
@@ -362,7 +361,6 @@ PRODUCT_PACKAGES += \
     libsurround_3mic_proc \
     libswvdec \
     libvppclient \
-    libmisoundfx \
     libshoebox \
     android.hardware.camera.provider@2.4-legacy \
     com.qti.sensor.ofilm_hi259 \
@@ -784,8 +782,8 @@ PRODUCT_PACKAGES += \
     dpmapi \
     qcrilhook \
     qti-telephony-common \
-    manifest_android.hardware.drm@1.3-service.widevine \
-    vendor.qti.gnss@4.0-service \
+    manifest_android.hardware.drm@1.3-service.widevine.xml \
+    vendor.qti.gnss@4.0-service.xml \
     adpl \
     adsprpcd \
     batterysecret \