diff --git a/Android.bp b/Android.bp
index 8b8358e..0a1d596 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,6 +3,8 @@
 // This file is generated by device/realme/RM6785-common/setup-makefiles.sh
 
 soong_namespace {
+	imports: [
+	],
 }
 
 cc_prebuilt_library_shared {
@@ -15234,7 +15236,12 @@
 cc_prebuilt_binary {
 	name: "atcid",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/atcid"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/atcid"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15246,7 +15253,12 @@
 cc_prebuilt_binary {
 	name: "audiocmdservice_atci",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/audiocmdservice_atci"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/audiocmdservice_atci"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15258,7 +15270,12 @@
 cc_prebuilt_binary {
 	name: "autobt",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/autobt"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/autobt"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15270,7 +15287,12 @@
 cc_prebuilt_binary {
 	name: "bip",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/bip"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/bip"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15282,7 +15304,12 @@
 cc_prebuilt_binary {
 	name: "ccci_fsd",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/ccci_fsd"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/ccci_fsd"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15294,7 +15321,12 @@
 cc_prebuilt_binary {
 	name: "ccci_mdinit",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/ccci_mdinit"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/ccci_mdinit"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15306,7 +15338,12 @@
 cc_prebuilt_binary {
 	name: "ccci_rpcd",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/ccci_rpcd"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/ccci_rpcd"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15318,7 +15355,12 @@
 cc_prebuilt_binary {
 	name: "charon",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/charon"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/charon"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15330,7 +15372,12 @@
 cc_prebuilt_binary {
 	name: "dconfig",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/dconfig"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/dconfig"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15342,7 +15389,12 @@
 cc_prebuilt_binary {
 	name: "dexecutor",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/dexecutor"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/dexecutor"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15354,7 +15406,12 @@
 cc_prebuilt_binary {
 	name: "doeapp-memtester",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/doeapp-memtester"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/doeapp-memtester"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15366,7 +15423,12 @@
 cc_prebuilt_binary {
 	name: "doeapp-sat",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/doeapp-sat"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/doeapp-sat"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15378,7 +15440,12 @@
 cc_prebuilt_binary {
 	name: "dtc_vendor",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/dtc_vendor"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/dtc_vendor"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15390,7 +15457,12 @@
 cc_prebuilt_binary {
 	name: "em_hidl",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/em_hidl"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/em_hidl"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15402,7 +15474,12 @@
 cc_prebuilt_binary {
 	name: "epdg_wod",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/epdg_wod"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/epdg_wod"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15414,7 +15491,12 @@
 cc_prebuilt_binary {
 	name: "factory",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/factory"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/factory"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15426,7 +15508,12 @@
 cc_prebuilt_binary {
 	name: "fuelgauged",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/fuelgauged"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/fuelgauged"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15438,7 +15525,12 @@
 cc_prebuilt_binary {
 	name: "fuelgauged_nvram",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/fuelgauged_nvram"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/fuelgauged_nvram"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15450,7 +15542,12 @@
 cc_prebuilt_binary {
 	name: "gsm0710muxd",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/gsm0710muxd"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/gsm0710muxd"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15462,7 +15559,12 @@
 cc_prebuilt_binary {
 	name: "android.hardware.bluetooth@1.0-service-mediatek",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-mediatek"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-mediatek"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15475,7 +15577,12 @@
 cc_prebuilt_binary {
 	name: "android.hardware.drm@1.3-service.widevine",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15488,7 +15595,12 @@
 cc_prebuilt_binary {
 	name: "android.hardware.gnss@2.1-service-mediatek",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-mediatek"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-mediatek"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15501,7 +15613,12 @@
 cc_prebuilt_binary {
 	name: "android.hardware.graphics.allocator@4.0-service-mediatek",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/android.hardware.graphics.allocator@4.0-service-mediatek"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/android.hardware.graphics.allocator@4.0-service-mediatek"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15514,7 +15631,12 @@
 cc_prebuilt_binary {
 	name: "android.hardware.keymaster@4.0-service.trustonic",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service.trustonic"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service.trustonic"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15527,7 +15649,12 @@
 cc_prebuilt_binary {
 	name: "android.hardware.neuralnetworks@1.3-service-mtk-neuron",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-mtk-neuron"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-mtk-neuron"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15540,7 +15667,12 @@
 cc_prebuilt_binary {
 	name: "android.hardware.secure_element@1.2-service-mediatek",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/android.hardware.secure_element@1.2-service-mediatek"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/android.hardware.secure_element@1.2-service-mediatek"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15553,7 +15685,12 @@
 cc_prebuilt_binary {
 	name: "android.hardware.sensors@2.0-service-mediatek",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/android.hardware.sensors@2.0-service-mediatek"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/android.hardware.sensors@2.0-service-mediatek"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15566,7 +15703,12 @@
 cc_prebuilt_binary {
 	name: "camerahalserver",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/camerahalserver"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/camerahalserver"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15579,7 +15721,12 @@
 cc_prebuilt_binary {
 	name: "mtkfusionrild",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/mtkfusionrild"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/mtkfusionrild"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15592,7 +15739,12 @@
 cc_prebuilt_binary {
 	name: "vendor.mediatek.hardware.dfps@1.0-service",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.dfps@1.0-service"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.dfps@1.0-service"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15605,7 +15757,12 @@
 cc_prebuilt_binary {
 	name: "vendor.mediatek.hardware.dplanner@2.0-service",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.dplanner@2.0-service"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.dplanner@2.0-service"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15618,7 +15775,12 @@
 cc_prebuilt_binary {
 	name: "vendor.mediatek.hardware.gpu@1.0-service",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.gpu@1.0-service"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.gpu@1.0-service"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15631,7 +15793,12 @@
 cc_prebuilt_binary {
 	name: "vendor.mediatek.hardware.keyinstall@1.0-service",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.keyinstall@1.0-service"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.keyinstall@1.0-service"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15644,7 +15811,12 @@
 cc_prebuilt_binary {
 	name: "vendor.mediatek.hardware.keymaster_attestation@1.1-service",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.keymaster_attestation@1.1-service"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.keymaster_attestation@1.1-service"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15657,7 +15829,12 @@
 cc_prebuilt_binary {
 	name: "vendor.mediatek.hardware.mms@1.5-service",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.mms@1.5-service"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.mms@1.5-service"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15670,7 +15847,12 @@
 cc_prebuilt_binary {
 	name: "vendor.mediatek.hardware.mtkcodecservice@1.1-service",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-service"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-service"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15683,7 +15865,12 @@
 cc_prebuilt_binary {
 	name: "vendor.mediatek.hardware.nvram@1.1-service",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.nvram@1.1-service"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.nvram@1.1-service"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15696,7 +15883,12 @@
 cc_prebuilt_binary {
 	name: "vendor.mediatek.hardware.pq@2.2-service",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.pq@2.2-service"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.pq@2.2-service"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15709,7 +15901,12 @@
 cc_prebuilt_binary {
 	name: "vendor.trustonic.tee@1.1-service",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/vendor.trustonic.tee@1.1-service"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/vendor.trustonic.tee@1.1-service"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15722,7 +15919,12 @@
 cc_prebuilt_binary {
 	name: "vtservice_hidl",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/vtservice_hidl"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/vtservice_hidl"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15735,7 +15937,12 @@
 cc_prebuilt_binary {
 	name: "wpa_supplicant",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/hw/wpa_supplicant"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/wpa_supplicant"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15748,7 +15955,12 @@
 cc_prebuilt_binary {
 	name: "ipsec_mon",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/ipsec_mon"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/ipsec_mon"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15760,7 +15972,12 @@
 cc_prebuilt_binary {
 	name: "jpegtool",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/jpegtool"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/jpegtool"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15772,7 +15989,12 @@
 cc_prebuilt_binary {
 	name: "lbs_hidl_service",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/lbs_hidl_service"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/lbs_hidl_service"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15784,7 +16006,12 @@
 cc_prebuilt_binary {
 	name: "mcDriverDaemon",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/mcDriverDaemon"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/mcDriverDaemon"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15796,7 +16023,12 @@
 cc_prebuilt_binary {
 	name: "md_monitor",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/md_monitor"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/md_monitor"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15808,7 +16040,12 @@
 cc_prebuilt_binary {
 	name: "md_monitor_ctrl",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/md_monitor_ctrl"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/md_monitor_ctrl"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15820,7 +16057,12 @@
 cc_prebuilt_binary {
 	name: "mnld",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/mnld"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/mnld"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15832,7 +16074,12 @@
 cc_prebuilt_binary {
 	name: "mtk_agpsd",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/mtk_agpsd"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/mtk_agpsd"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15844,7 +16091,12 @@
 cc_prebuilt_binary {
 	name: "muxreport",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/muxreport"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/muxreport"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15856,7 +16108,12 @@
 cc_prebuilt_binary {
 	name: "netdagent",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/netdagent"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/netdagent"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15868,7 +16125,12 @@
 cc_prebuilt_binary {
 	name: "netdc",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/netdc"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/netdc"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15880,7 +16142,12 @@
 cc_prebuilt_binary {
 	name: "nvram_daemon",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/nvram_daemon"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/nvram_daemon"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15892,7 +16159,12 @@
 cc_prebuilt_binary {
 	name: "ppl_agent",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/ppl_agent"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/ppl_agent"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15904,7 +16176,12 @@
 cc_prebuilt_binary {
 	name: "starter",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/starter"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/starter"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15916,7 +16193,12 @@
 cc_prebuilt_binary {
 	name: "stp_dump3",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/stp_dump3"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/stp_dump3"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15928,7 +16210,12 @@
 cc_prebuilt_binary {
 	name: "stroke",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/stroke"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/stroke"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15940,7 +16227,12 @@
 cc_prebuilt_binary {
 	name: "thermal",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/thermal"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/thermal"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15952,7 +16244,12 @@
 cc_prebuilt_binary {
 	name: "thermal_manager",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/thermal_manager"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/thermal_manager"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15964,7 +16261,12 @@
 cc_prebuilt_binary {
 	name: "thermalloadalgod",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/thermalloadalgod"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/thermalloadalgod"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15976,7 +16278,12 @@
 cc_prebuilt_binary {
 	name: "volte_imcb",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/volte_imcb"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/volte_imcb"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -15988,7 +16295,12 @@
 cc_prebuilt_binary {
 	name: "volte_imsm_93",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/volte_imsm_93"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/volte_imsm_93"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -16000,7 +16312,12 @@
 cc_prebuilt_binary {
 	name: "volte_md_status",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/volte_md_status"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/volte_md_status"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -16012,7 +16329,12 @@
 cc_prebuilt_binary {
 	name: "volte_stack",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/volte_stack"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/volte_stack"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -16024,7 +16346,12 @@
 cc_prebuilt_binary {
 	name: "volte_ua",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/volte_ua"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/volte_ua"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -16036,7 +16363,12 @@
 cc_prebuilt_binary {
 	name: "vpud",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/vpud"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/vpud"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -16048,7 +16380,12 @@
 cc_prebuilt_binary {
 	name: "wfca",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/wfca"],
+	target: {
+		android_arm: {
+			srcs: ["proprietary/vendor/bin/wfca"],
+		},
+	},
+	compile_multilib: "32",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -16060,7 +16397,12 @@
 cc_prebuilt_binary {
 	name: "wlan_assistant",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/wlan_assistant"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/wlan_assistant"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -16072,7 +16414,12 @@
 cc_prebuilt_binary {
 	name: "wmt_launcher",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/wmt_launcher"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/wmt_launcher"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -16084,7 +16431,12 @@
 cc_prebuilt_binary {
 	name: "wmt_loader",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/wmt_loader"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/wmt_loader"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -16096,7 +16448,12 @@
 cc_prebuilt_binary {
 	name: "wpa_cli",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/wpa_cli"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/wpa_cli"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -16108,7 +16465,12 @@
 cc_prebuilt_binary {
 	name: "xcap",
 	owner: "realme",
-	srcs: ["proprietary/vendor/bin/xcap"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/xcap"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -16120,7 +16482,12 @@
 cc_prebuilt_binary {
 	name: "vtservice",
 	owner: "realme",
-	srcs: ["proprietary/system_ext/bin/vtservice"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/bin/vtservice"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -16132,7 +16499,12 @@
 cc_prebuilt_binary {
 	name: "vendor.oplus.hardware.biometrics.fingerprint@2.1-service",
 	owner: "realme",
-	srcs: ["proprietary/odm/bin/hw/vendor.oplus.hardware.biometrics.fingerprint@2.1-service"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/odm/bin/hw/vendor.oplus.hardware.biometrics.fingerprint@2.1-service"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,