cupid: Get rid of 32 bit blobs

Android.bp

@@ -15,14 +15,11 @@ cc_prebuilt_library_shared {
 		none: true,
 	},
 	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libagm.so"],
-		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libagm.so"],
 		},
 	},
-	compile_multilib: "both",
+	compile_multilib: "64",
 	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
@@ -35,14 +32,11 @@ cc_prebuilt_library_shared {
 		none: true,
 	},
 	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libar-pal.so"],
-		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libar-pal.so"],
 		},
 	},
-	compile_multilib: "both",
+	compile_multilib: "64",
 	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,
@@ -55,14 +49,11 @@ cc_prebuilt_library_shared {
 		none: true,
 	},
 	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/[email protected]"],
-		},
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/[email protected]"],
 		},
 	},
-	compile_multilib: "both",
+	compile_multilib: "64",
 	check_elf_files: false,
 	prefer: true,
 	soc_specific: true,

cupid-vendor.mk

@@ -6,7 +6,6 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/xiaomi/cupid
 
 PRODUCT_COPY_FILES += \
-    vendor/xiaomi/cupid/proprietary/odm/lib/[email protected]:$(TARGET_COPY_OUT_ODM)/lib/[email protected] \
     vendor/xiaomi/cupid/proprietary/odm/lib64/[email protected]:$(TARGET_COPY_OUT_ODM)/lib64/[email protected] \
     vendor/xiaomi/cupid/proprietary/vendor/etc/displayconfig/display_id_4630946545580055170.xml:$(TARGET_COPY_OUT_VENDOR)/etc/displayconfig/display_id_4630946545580055170.xml \
     vendor/xiaomi/cupid/proprietary/vendor/bin/agmcap:$(TARGET_COPY_OUT_VENDOR)/bin/agmcap \
@@ -632,99 +631,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/cupid/proprietary/vendor/firmware/vpu20_4v.b19:$(TARGET_COPY_OUT_VENDOR)/firmware/vpu20_4v.b19 \
     vendor/xiaomi/cupid/proprietary/vendor/firmware/vpu20_4v.mbn:$(TARGET_COPY_OUT_VENDOR)/firmware/vpu20_4v.mbn \
     vendor/xiaomi/cupid/proprietary/vendor/firmware/vpu20_4v.mdt:$(TARGET_COPY_OUT_VENDOR)/firmware/vpu20_4v.mdt \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/com.qti.sensormodule.cupid_ofilm_ov32b40_front.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/com.qti.sensormodule.cupid_ofilm_ov32b40_front.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/com.qti.sensormodule.cupid_semco_imx700_wide.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/com.qti.sensormodule.cupid_semco_imx700_wide.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/com.qti.sensormodule.cupid_semco_imx707_wide.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/com.qti.sensormodule.cupid_semco_imx707_wide.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/com.qti.sensormodule.cupid_semco_imx766_wide.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/com.qti.sensormodule.cupid_semco_imx766_wide.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/com.qti.sensormodule.cupid_sunny_ov13b10_ultra.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/com.qti.sensormodule.cupid_sunny_ov13b10_ultra.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/com.qti.sensormodule.cupid_sunny_s5k5e9_macro.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/com.qti.sensormodule.cupid_sunny_s5k5e9_macro.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/com.qti.tuned.cupid_ofilm_ov32b40_front.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/com.qti.tuned.cupid_ofilm_ov32b40_front.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/com.qti.tuned.cupid_semco_imx707_wide.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/com.qti.tuned.cupid_semco_imx707_wide.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/com.qti.tuned.cupid_semco_imx766_wide.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/com.qti.tuned.cupid_semco_imx766_wide.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/com.qti.tuned.cupid_sunny_ov13b10_ultra.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/com.qti.tuned.cupid_sunny_ov13b10_ultra.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/com.qti.tuned.cupid_sunny_s5k5e9_macro.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/com.qti.tuned.cupid_sunny_s5k5e9_macro.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/com.qti.tuned.default.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/com.qti.tuned.default.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/fdconfigpreview.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/fdconfigpreview.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/fdconfigpreviewlite.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/fdconfigpreviewlite.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/fdconfigvideo.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/fdconfigvideo.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/camera/fdconfigvideolite.bin:$(TARGET_COPY_OUT_VENDOR)/lib/camera/fdconfigvideolite.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/com.qti.settings.fillmore.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qti.settings.fillmore.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/com.qti.settings.sm8450.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qti.settings.sm8450.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/hw/audio.primary.taro.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/audio.primary.taro.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/hw/fingerprint.goodix_fod.default.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/fingerprint.goodix_fod.default.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/hw/gyro_fusion_interface.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/gyro_fusion_interface.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/hw/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/hw/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libAF.so:$(TARGET_COPY_OUT_VENDOR)/lib/libAF.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libSNPE.so:$(TARGET_COPY_OUT_VENDOR)/lib/libSNPE.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libSnpeCpu.so:$(TARGET_COPY_OUT_VENDOR)/lib/libSnpeCpu.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libSnpeGpu.so:$(TARGET_COPY_OUT_VENDOR)/lib/libSnpeGpu.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libSnpeHtpV69Stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libSnpeHtpV69Stub.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libadm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadm.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libadsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadsprpc.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libagm_compress_plugin.so:$(TARGET_COPY_OUT_VENDOR)/lib/libagm_compress_plugin.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libagm_mixer_plugin.so:$(TARGET_COPY_OUT_VENDOR)/lib/libagm_mixer_plugin.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libagm_pcm_plugin.so:$(TARGET_COPY_OUT_VENDOR)/lib/libagm_pcm_plugin.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libagmclient.so:$(TARGET_COPY_OUT_VENDOR)/lib/libagmclient.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libagmmixer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libagmmixer.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libar-acdb.so:$(TARGET_COPY_OUT_VENDOR)/lib/libar-acdb.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libar-gpr.so:$(TARGET_COPY_OUT_VENDOR)/lib/libar-gpr.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libar-gsl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libar-gsl.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libats.so:$(TARGET_COPY_OUT_VENDOR)/lib/libats.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libaudio_log_utils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libaudio_log_utils.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libaudiocloudctrl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libaudiocloudctrl.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libaudioroute_ext.so:$(TARGET_COPY_OUT_VENDOR)/lib/libaudioroute_ext.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libbatterylistener.so:$(TARGET_COPY_OUT_VENDOR)/lib/libbatterylistener.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libc++_shared.so:$(TARGET_COPY_OUT_VENDOR)/lib/libc++_shared.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libcamxcommonutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxcommonutils.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libcamxexternalformatutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxexternalformatutils.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libcamxsettingsmanager.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxsettingsmanager.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libcapiv2svacnnvendor.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcapiv2svacnnvendor.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libcapiv2svarnnvendor.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcapiv2svarnnvendor.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libcapiv2uvvendor.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcapiv2uvvendor.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libcvface_api.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcvface_api.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libdapparamstorage.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdapparamstorage.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libfmpal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libfmpal.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libgf_hal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgf_hal.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libkaraokepal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libkaraokepal.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/liblx-ar_util.so:$(TARGET_COPY_OUT_VENDOR)/lib/liblx-ar_util.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/liblx-osal.so:$(TARGET_COPY_OUT_VENDOR)/lib/liblx-osal.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libmcs.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmcs.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libmemunreachable.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmemunreachable.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libmialgo_ai_vision.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmialgo_ai_vision.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libmialgo_globalsaliency.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmialgo_globalsaliency.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libmialgo_utils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmialgo_utils.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libmisight.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmisight.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libos.so:$(TARGET_COPY_OUT_VENDOR)/lib/libos.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libpal_net_if.so:$(TARGET_COPY_OUT_VENDOR)/lib/libpal_net_if.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libpalclient.so:$(TARGET_COPY_OUT_VENDOR)/lib/libpalclient.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libqshcamera.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqshcamera.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libqtigefar.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqtigefar.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libquickcamera.so:$(TARGET_COPY_OUT_VENDOR)/lib/libquickcamera.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libresampler.so:$(TARGET_COPY_OUT_VENDOR)/lib/libresampler.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libsndcardparser.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsndcardparser.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libsnpe_dsp_domains_v2.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsnpe_dsp_domains_v2.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libsnpe_dsp_domains_v3.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsnpe_dsp_domains_v3.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libsynx.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsynx.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libthreadutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libthreadutils.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libxlog.so:$(TARGET_COPY_OUT_VENDOR)/lib/libxlog.so \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/libxmi_slow_motion_mein.so:$(TARGET_COPY_OUT_VENDOR)/lib/libxmi_slow_motion_mein.so \
     vendor/xiaomi/cupid/proprietary/vendor/lib/rfsa/adsp/bm2n00.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/bm2n00.bin \
     vendor/xiaomi/cupid/proprietary/vendor/lib/rfsa/adsp/bm2n01.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/bm2n01.bin \
     vendor/xiaomi/cupid/proprietary/vendor/lib/rfsa/adsp/bm2n02.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/bm2n02.bin \
@@ -786,10 +692,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/cupid/proprietary/vendor/lib/rfsa/adsp/misound_res_headphone.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/misound_res_headphone.bin \
     vendor/xiaomi/cupid/proprietary/vendor/lib/rfsa/adsp/misound_res_spk.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/misound_res_spk.bin \
     vendor/xiaomi/cupid/proprietary/vendor/lib/rfsa/adsp/misound_res_spk4ch.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/misound_res_spk4ch.bin \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
-    vendor/xiaomi/cupid/proprietary/vendor/lib/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib/[email protected] \
     vendor/xiaomi/cupid/proprietary/vendor/lib64/camera/com.qti.eeprom.cupid_ofilm_ov32b40_p24c64f_front_eeprom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.cupid_ofilm_ov32b40_p24c64f_front_eeprom.so \
     vendor/xiaomi/cupid/proprietary/vendor/lib64/camera/com.qti.eeprom.cupid_semco_imx707_p24c128f_wide_eeprom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.cupid_semco_imx707_p24c128f_wide_eeprom.so \
     vendor/xiaomi/cupid/proprietary/vendor/lib64/camera/com.qti.eeprom.cupid_semco_imx766_p24c128f_wide_eeprom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.cupid_semco_imx766_p24c128f_wide_eeprom.so \