From c12d208c195a6507d836b5fe6b0e1a2b036873c0 Mon Sep 17 00:00:00 2001 From: basamaryan Date: Thu, 28 Mar 2024 00:51:14 -0400 Subject: [PATCH] sm6150-common: Regenerate makefiles Change-Id: Ie8af3bdc6853dfc27b7dfb0186589df083b85f49 --- Android.bp | 1072 +++++++++++++++++++-------------------- sm6150-common-vendor.mk | 58 +-- 2 files changed, 538 insertions(+), 592 deletions(-) diff --git a/Android.bp b/Android.bp index 68a5316..87a09ba 100644 --- a/Android.bp +++ b/Android.bp @@ -3,6 +3,8 @@ // This file is generated by device/xiaomi/sm6150-common/setup-makefiles.sh soong_namespace { + imports: [ + ], } cc_prebuilt_library_shared { @@ -1159,528 +1161,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "capi_v2_aptX_CLHDAD_Encoder", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDAD_Encoder.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "capi_v2_aptX_Classic", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_Classic.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "capi_v2_aptX_HD", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_HD.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "capi_v2_dap_cpdp", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/capi_v2_dap_cpdp.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libVC1Dec", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libVC1Dec.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libVC1DecDsp_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libVC1DecDsp_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libapps_mem_heap", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libapps_mem_heap.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libarc_hta_driver_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libarc_hta_driver_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libarcsoft_dualcam_refocus_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libarcsoft_dualcam_refocus_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libarcsoft_hdrplus_hvx_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libarcsoft_hdrplus_hvx_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libcamera_nn_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libcamera_nn_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libcvpdsp_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libcvpdsp_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libdirac-capiv2", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libdirac-capiv2.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libdspCV_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libdspCV_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libdsp_streamer_add_constant", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libdsp_streamer_add_constant.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libdsp_streamer_binning", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libdsp_streamer_binning.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libdsp_streamer_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libdsp_streamer_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libfastcvadsp", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libfastcvadsp.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libfastcvdsp_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libfastcvdsp_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libhexagon_nn_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libhexagon_nn_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libhexagon_nn_skel_secondary", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libhexagon_nn_skel_secondary.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libhta_dsp_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libhta_dsp_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libmialgo_rfs_cdsp_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libmialgo_rfs_cdsp_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libscveObjectSegmentation_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libscveT2T_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libscveT2T_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libsnpe_dsp_v65_domains_v2_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_v65_domains_v2_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libsnpe_dsp_v66_domains_v2_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_v66_domains_v2_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libsns_device_mode_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libsns_device_mode_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libsns_low_lat_stream_skel", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: ["proprietary/vendor/lib/rfsa/adsp/libsns_low_lat_stream_skel.so"], - }, - }, - compile_multilib: "32", - check_elf_files: false, - relative_install_path: "rfsa/adsp", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libasphere", owner: "xiaomi", @@ -4996,6 +4476,267 @@ cc_prebuilt_library_shared { soc_specific: true, } +prebuilt_rfsa { + name: "capi_v2_aptX_CLHDAD_Encoder", + filename: "capi_v2_aptX_CLHDAD_Encoder.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDAD_Encoder.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "capi_v2_aptX_Classic", + filename: "capi_v2_aptX_Classic.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_Classic.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "capi_v2_aptX_HD", + filename: "capi_v2_aptX_HD.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_HD.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "capi_v2_dap_cpdp", + filename: "capi_v2_dap_cpdp.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/capi_v2_dap_cpdp.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libVC1Dec", + filename: "libVC1Dec.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libVC1Dec.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libVC1DecDsp_skel", + filename: "libVC1DecDsp_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libVC1DecDsp_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libapps_mem_heap", + filename: "libapps_mem_heap.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libapps_mem_heap.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libarc_hta_driver_skel", + filename: "libarc_hta_driver_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libarc_hta_driver_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libarcsoft_dualcam_refocus_skel", + filename: "libarcsoft_dualcam_refocus_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libarcsoft_dualcam_refocus_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libarcsoft_hdrplus_hvx_skel", + filename: "libarcsoft_hdrplus_hvx_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libarcsoft_hdrplus_hvx_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libcamera_nn_skel", + filename: "libcamera_nn_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libcamera_nn_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libcvpdsp_skel", + filename: "libcvpdsp_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libcvpdsp_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libdirac-capiv2", + filename: "libdirac-capiv2.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libdirac-capiv2.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libdspCV_skel", + filename: "libdspCV_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libdspCV_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libdsp_streamer_add_constant", + filename: "libdsp_streamer_add_constant.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libdsp_streamer_add_constant.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libdsp_streamer_binning", + filename: "libdsp_streamer_binning.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libdsp_streamer_binning.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libdsp_streamer_skel", + filename: "libdsp_streamer_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libdsp_streamer_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libfastcvadsp", + filename: "libfastcvadsp.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libfastcvadsp.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libfastcvdsp_skel", + filename: "libfastcvdsp_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libfastcvdsp_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libhexagon_nn_skel", + filename: "libhexagon_nn_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libhexagon_nn_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libhexagon_nn_skel_secondary", + filename: "libhexagon_nn_skel_secondary.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libhexagon_nn_skel_secondary.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libhta_dsp_skel", + filename: "libhta_dsp_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libhta_dsp_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libmialgo_rfs_cdsp_skel", + filename: "libmialgo_rfs_cdsp_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libmialgo_rfs_cdsp_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libscveObjectSegmentation_skel", + filename: "libscveObjectSegmentation_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libscveT2T_skel", + filename: "libscveT2T_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libscveT2T_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libsnpe_dsp_v65_domains_v2_skel", + filename: "libsnpe_dsp_v65_domains_v2_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_v65_domains_v2_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libsnpe_dsp_v66_domains_v2_skel", + filename: "libsnpe_dsp_v66_domains_v2_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_v66_domains_v2_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libsns_device_mode_skel", + filename: "libsns_device_mode_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libsns_device_mode_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + +prebuilt_rfsa { + name: "libsns_low_lat_stream_skel", + filename: "libsns_low_lat_stream_skel.so", + owner: "xiaomi", + src: "proprietary/vendor/lib/rfsa/adsp/libsns_low_lat_stream_skel.so", + relative_install_path: "adsp", + soc_specific: true, +} + cc_prebuilt_library_shared { name: "com.qualcomm.qti.dpm.api@1.0_system_ext", stem: "com.qualcomm.qti.dpm.api@1.0", @@ -5481,7 +5222,12 @@ prebuilt_etc_xml { cc_prebuilt_binary { name: "adpl", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/adpl"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/adpl"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5493,7 +5239,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "adsprpcd", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/adsprpcd"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/adsprpcd"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5505,7 +5256,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "cdsprpcd", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/cdsprpcd"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/cdsprpcd"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5517,7 +5273,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "cnd", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/cnd"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/cnd"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5529,7 +5290,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "cnss-daemon", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/cnss-daemon"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/cnss-daemon"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5541,7 +5307,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "dpmQmiMgr", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/dpmQmiMgr"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/dpmQmiMgr"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5553,7 +5324,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "dspservice", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/dspservice"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/dspservice"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5565,7 +5341,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "hvdcp_opti", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/hvdcp_opti"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hvdcp_opti"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5577,7 +5358,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "android.hardware.bluetooth@1.0-service-qti", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5590,7 +5376,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "android.hardware.drm@1.3-service.widevine", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5603,7 +5394,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "android.hardware.gatekeeper@1.0-service-qti", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5616,7 +5412,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "android.hardware.keymaster@4.1-service-qti", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/hw/android.hardware.keymaster@4.1-service-qti"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/android.hardware.keymaster@4.1-service-qti"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5629,7 +5430,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "qcrild", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/hw/qcrild"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/qcrild"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5642,7 +5448,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.qti.hardware.alarm@1.0-service", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5655,7 +5466,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.qti.hardware.capabilityconfigstore@1.0-service", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5668,7 +5484,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.qti.hardware.soter@1.0-service", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5681,7 +5502,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.qti.media.c2@1.0-service", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/hw/vendor.qti.media.c2@1.0-service"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/hw/vendor.qti.media.c2@1.0-service"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -5694,7 +5520,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "ims_rtp_daemon", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/ims_rtp_daemon"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/ims_rtp_daemon"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5706,7 +5537,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "imsdatadaemon", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/imsdatadaemon"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/imsdatadaemon"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5718,7 +5554,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "imsqmidaemon", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/imsqmidaemon"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/imsqmidaemon"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5730,7 +5571,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "imsrcsd", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/imsrcsd"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/imsrcsd"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5742,7 +5588,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "irsc_util", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/irsc_util"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/irsc_util"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5754,7 +5605,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "loc_launcher", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/loc_launcher"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/loc_launcher"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5766,7 +5622,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "lowi-server", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/lowi-server"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/lowi-server"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5778,7 +5639,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "msm_irqbalance", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/msm_irqbalance"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/msm_irqbalance"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5790,7 +5656,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "netmgrd", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/netmgrd"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/netmgrd"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5802,7 +5673,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "nv_mac", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/nv_mac"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/nv_mac"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5814,7 +5690,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "pd-mapper", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/pd-mapper"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/pd-mapper"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5826,7 +5707,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "pm-proxy", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/pm-proxy"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/pm-proxy"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5838,7 +5724,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "pm-service", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/pm-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/pm-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5850,7 +5741,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "power_off_alarm", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/power_off_alarm"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/power_off_alarm"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5862,7 +5758,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "qrtr-ns", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/qrtr-ns"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/qrtr-ns"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5874,7 +5775,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "qseecomd", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/qseecomd"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/qseecomd"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5886,7 +5792,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "qti", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/qti"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/qti"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5898,7 +5809,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "rmt_storage", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/rmt_storage"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/rmt_storage"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5910,7 +5826,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "slim_daemon", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/slim_daemon"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/slim_daemon"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5922,7 +5843,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "tftp_server", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/tftp_server"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/tftp_server"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5934,7 +5860,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "time_daemon", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/time_daemon"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/time_daemon"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5946,7 +5877,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vppservice", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/vppservice"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/vppservice"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5958,7 +5894,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "xtra-daemon", owner: "xiaomi", - srcs: ["proprietary/vendor/bin/xtra-daemon"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/xtra-daemon"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -5970,7 +5911,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "dpmd", owner: "xiaomi", - srcs: ["proprietary/system_ext/bin/dpmd"], + target: { + android_arm64: { + srcs: ["proprietary/system_ext/bin/dpmd"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, diff --git a/sm6150-common-vendor.mk b/sm6150-common-vendor.mk index 633ee66..3c00f90 100644 --- a/sm6150-common-vendor.mk +++ b/sm6150-common-vendor.mk @@ -162,35 +162,6 @@ PRODUCT_PACKAGES += \ libsmwrapper \ libswvdec \ libvppclient \ - capi_v2_aptX_CLHDAD_Encoder \ - capi_v2_aptX_Classic \ - capi_v2_aptX_HD \ - capi_v2_dap_cpdp \ - libVC1Dec \ - libVC1DecDsp_skel \ - libapps_mem_heap \ - libarc_hta_driver_skel \ - libarcsoft_dualcam_refocus_skel \ - libarcsoft_hdrplus_hvx_skel \ - libcamera_nn_skel \ - libcvpdsp_skel \ - libdirac-capiv2 \ - libdspCV_skel \ - libdsp_streamer_add_constant \ - libdsp_streamer_binning \ - libdsp_streamer_skel \ - libfastcvadsp \ - libfastcvdsp_skel \ - libhexagon_nn_skel \ - libhexagon_nn_skel_secondary \ - libhta_dsp_skel \ - libmialgo_rfs_cdsp_skel \ - libscveObjectSegmentation_skel \ - libscveT2T_skel \ - libsnpe_dsp_v65_domains_v2_skel \ - libsnpe_dsp_v66_domains_v2_skel \ - libsns_device_mode_skel \ - libsns_low_lat_stream_skel \ libasphere \ libshoebox \ com.qualcomm.qti.dpm.api@1.0_vendor \ @@ -385,6 +356,35 @@ PRODUCT_PACKAGES += \ vendor.qti.imsrtpservice@3.0_vendor \ vendor.qti.latency@2.0 \ vendor.qti.latency@2.1 \ + capi_v2_aptX_CLHDAD_Encoder \ + capi_v2_aptX_Classic \ + capi_v2_aptX_HD \ + capi_v2_dap_cpdp \ + libVC1Dec \ + libVC1DecDsp_skel \ + libapps_mem_heap \ + libarc_hta_driver_skel \ + libarcsoft_dualcam_refocus_skel \ + libarcsoft_hdrplus_hvx_skel \ + libcamera_nn_skel \ + libcvpdsp_skel \ + libdirac-capiv2 \ + libdspCV_skel \ + libdsp_streamer_add_constant \ + libdsp_streamer_binning \ + libdsp_streamer_skel \ + libfastcvadsp \ + libfastcvdsp_skel \ + libhexagon_nn_skel \ + libhexagon_nn_skel_secondary \ + libhta_dsp_skel \ + libmialgo_rfs_cdsp_skel \ + libscveObjectSegmentation_skel \ + libscveT2T_skel \ + libsnpe_dsp_v65_domains_v2_skel \ + libsnpe_dsp_v66_domains_v2_skel \ + libsns_device_mode_skel \ + libsns_low_lat_stream_skel \ com.qualcomm.qti.dpm.api@1.0_system_ext \ fm_helium \ lib-imsvideocodec \