diff --git a/Android.bp b/Android.bp index f1245df..74a6c04 100644 --- a/Android.bp +++ b/Android.bp @@ -568,6 +568,90 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libcdsprpc", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/vendor/lib/libcdsprpc.so"], + shared_libs: ["libhidlbase", "libhardware", "libutils", "vendor.qti.hardware.dsp@1.0", "liblog", "libc", "libcutils", "libion", "libc++", "libm", "libdl", ], + }, + android_arm64: { + srcs: ["proprietary/vendor/lib64/libcdsprpc.so"], + shared_libs: ["libhidlbase", "libhardware", "libutils", "vendor.qti.hardware.dsp@1.0", "liblog", "libc", "libcutils", "libion", "libc++", "libm", "libdl", ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libconfigdb", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/vendor/lib/libconfigdb.so"], + shared_libs: ["libxml", "libdsutils", "libdiag", "liblog", "libc++", "libc", "libm", "libdl", ], + }, + android_arm64: { + srcs: ["proprietary/vendor/lib64/libconfigdb.so"], + shared_libs: ["libxml", "libdsutils", "libdiag", "liblog", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libcvp2_1", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/vendor/lib/libcvp2_1.so"], + shared_libs: ["liblog", "libion", "libutils", "libcvp_common", "libc++", "libc", "libm", "libdl", ], + }, + android_arm64: { + srcs: ["proprietary/vendor/lib64/libcvp2_1.so"], + shared_libs: ["liblog", "libion", "libutils", "libcvp_common", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libcvp_common", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/vendor/lib/libcvp_common.so"], + shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ], + }, + android_arm64: { + srcs: ["proprietary/vendor/lib64/libcvp_common.so"], + shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libdiag", owner: "xiaomi", @@ -631,6 +715,48 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libfastcvdsp_stub", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/vendor/lib/libfastcvdsp_stub.so"], + shared_libs: ["liblog", "libcdsprpc", "libc++", "libc", "libm", "libdl", ], + }, + android_arm64: { + srcs: ["proprietary/vendor/lib64/libfastcvdsp_stub.so"], + shared_libs: ["liblog", "libcdsprpc", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libfastcvopt", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/vendor/lib/libfastcvopt.so"], + shared_libs: ["liblog", "libion", "libOpenCL", "libfastcvdsp_stub", "libcdsprpc", "libc++", "libc", "libm", "libdl", ], + }, + android_arm64: { + srcs: ["proprietary/vendor/lib64/libfastcvopt.so"], + shared_libs: ["liblog", "libion", "libOpenCL", "libfastcvdsp_stub", "libcdsprpc", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libgsl", owner: "xiaomi", @@ -715,6 +841,27 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libmdmdetect", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/vendor/lib/libmdmdetect.so"], + shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ], + }, + android_arm64: { + srcs: ["proprietary/vendor/lib64/libmdmdetect.so"], + shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libmmosal-vendor", stem: "libmmosal", @@ -737,6 +884,27 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libnetmgr", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/vendor/lib/libnetmgr.so"], + shared_libs: ["libdsutils", "libconfigdb", "libdiag", "libcutils", "liblog", "libhardware_legacy", "libc++", "libc", "libm", "libdl", ], + }, + android_arm64: { + srcs: ["proprietary/vendor/lib64/libnetmgr.so"], + shared_libs: ["libdsutils", "libconfigdb", "libdiag", "libcutils", "liblog", "libhardware_legacy", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libperfconfig", owner: "xiaomi", @@ -1304,6 +1472,27 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libthermalclient", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/vendor/lib/libthermalclient.so"], + shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ], + }, + android_arm64: { + srcs: ["proprietary/vendor/lib64/libthermalclient.so"], + shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libvppclient", owner: "xiaomi", @@ -1388,6 +1577,48 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libxml", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/vendor/lib/libxml.so"], + shared_libs: ["liblog", "libdiag", "libcutils", "libc++", "libc", "libm", "libdl", ], + }, + android_arm64: { + srcs: ["proprietary/vendor/lib64/libxml.so"], + shared_libs: ["liblog", "libdiag", "libcutils", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.dsp@1.0", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so"], + shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], + }, + android_arm64: { + srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so"], + shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "vendor.qti.hardware.qconfig@1.0", owner: "xiaomi", @@ -3288,23 +3519,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcdsprpc", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libcdsprpc.so"], - shared_libs: ["libhidlbase", "libhardware", "libutils", "vendor.qti.hardware.dsp@1.0", "liblog", "libc", "libcutils", "libion", "libc++", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcne", owner: "xiaomi", @@ -3357,23 +3571,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libconfigdb", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libconfigdb.so"], - shared_libs: ["libxml", "libdsutils", "libdiag", "liblog", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcpion", owner: "xiaomi", @@ -3391,40 +3588,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcvp2_1", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libcvp2_1.so"], - shared_libs: ["liblog", "libion", "libutils", "libcvp_common", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libcvp_common", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libcvp_common.so"], - shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcvpcpuRev_skel", owner: "xiaomi", @@ -3578,40 +3741,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libfastcvdsp_stub", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libfastcvdsp_stub.so"], - shared_libs: ["liblog", "libcdsprpc", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libfastcvopt", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libfastcvopt.so"], - shared_libs: ["liblog", "libion", "libOpenCL", "libfastcvdsp_stub", "libcdsprpc", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libhdr_tm", owner: "xiaomi", @@ -3901,23 +4030,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libmdmdetect", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libmdmdetect.so"], - shared_libs: ["libcutils", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libmdsprpc", owner: "xiaomi", @@ -4037,23 +4149,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libnetmgr", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libnetmgr.so"], - shared_libs: ["libdsutils", "libconfigdb", "libdiag", "libcutils", "liblog", "libhardware_legacy", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libnetmgr_common", owner: "xiaomi", @@ -4819,23 +4914,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libthermalclient", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libthermalclient.so"], - shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libtime_genoff", owner: "xiaomi", @@ -4939,23 +5017,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libxml", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libxml.so"], - shared_libs: ["liblog", "libdiag", "libcutils", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libxtadapter", owner: "xiaomi", @@ -5790,23 +5851,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.dsp@1.0", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so"], - shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "vendor.qti.hardware.fm@1.0", owner: "xiaomi", @@ -7017,8 +7061,12 @@ cc_prebuilt_library_shared { srcs: ["proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so"], shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], }, + android_arm64: { + srcs: ["proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so"], + shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], + }, }, - compile_multilib: "32", + compile_multilib: "both", prefer: true, system_ext_specific: true, } diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so new file mode 100644 index 0000000..2f41ef1 Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so differ diff --git a/proprietary/vendor/lib/libcdsprpc.so b/proprietary/vendor/lib/libcdsprpc.so new file mode 100644 index 0000000..5df5219 Binary files /dev/null and b/proprietary/vendor/lib/libcdsprpc.so differ diff --git a/proprietary/vendor/lib/libconfigdb.so b/proprietary/vendor/lib/libconfigdb.so new file mode 100644 index 0000000..ae08dd9 Binary files /dev/null and b/proprietary/vendor/lib/libconfigdb.so differ diff --git a/proprietary/vendor/lib/libcvp2_1.so b/proprietary/vendor/lib/libcvp2_1.so new file mode 100644 index 0000000..260db5f Binary files /dev/null and b/proprietary/vendor/lib/libcvp2_1.so differ diff --git a/proprietary/vendor/lib/libcvp_common.so b/proprietary/vendor/lib/libcvp_common.so new file mode 100644 index 0000000..a9fe818 Binary files /dev/null and b/proprietary/vendor/lib/libcvp_common.so differ diff --git a/proprietary/vendor/lib/libfastcvdsp_stub.so b/proprietary/vendor/lib/libfastcvdsp_stub.so new file mode 100644 index 0000000..ed04fc5 Binary files /dev/null and b/proprietary/vendor/lib/libfastcvdsp_stub.so differ diff --git a/proprietary/vendor/lib/libfastcvopt.so b/proprietary/vendor/lib/libfastcvopt.so new file mode 100644 index 0000000..1f9d102 Binary files /dev/null and b/proprietary/vendor/lib/libfastcvopt.so differ diff --git a/proprietary/vendor/lib/libmdmdetect.so b/proprietary/vendor/lib/libmdmdetect.so new file mode 100644 index 0000000..ff00a0a Binary files /dev/null and b/proprietary/vendor/lib/libmdmdetect.so differ diff --git a/proprietary/vendor/lib/libnetmgr.so b/proprietary/vendor/lib/libnetmgr.so new file mode 100644 index 0000000..9ce3c5f Binary files /dev/null and b/proprietary/vendor/lib/libnetmgr.so differ diff --git a/proprietary/vendor/lib/libthermalclient.so b/proprietary/vendor/lib/libthermalclient.so new file mode 100644 index 0000000..bf1bfdf Binary files /dev/null and b/proprietary/vendor/lib/libthermalclient.so differ diff --git a/proprietary/vendor/lib/libxml.so b/proprietary/vendor/lib/libxml.so new file mode 100644 index 0000000..c66eb76 Binary files /dev/null and b/proprietary/vendor/lib/libxml.so differ diff --git a/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so new file mode 100644 index 0000000..4b73a61 Binary files /dev/null and b/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so differ diff --git a/sm8350-common-vendor.mk b/sm8350-common-vendor.mk index 4e72808..aa337c2 100644 --- a/sm8350-common-vendor.mk +++ b/sm8350-common-vendor.mk @@ -168,14 +168,22 @@ PRODUCT_PACKAGES += \ libOpenCL \ libadreno_utils \ libc2d30_bltlib \ + libcdsprpc \ + libconfigdb \ + libcvp2_1 \ + libcvp_common \ libdiag \ libdsi_netctrl \ libdsutils \ + libfastcvdsp_stub \ + libfastcvopt \ libgsl \ libidl \ libllvm-glnext \ libllvm-qcom \ + libmdmdetect \ libmmosal-vendor \ + libnetmgr \ libperfconfig \ libperfgluelayer \ libperfioctl \ @@ -203,10 +211,13 @@ PRODUCT_PACKAGES += \ libscveObjectSegmentation_stub \ libscveObjectTracker \ libscveObjectTracker_stub \ + libthermalclient \ libvppclient \ libvpphcp \ libvpphvx \ libvpplibrary \ + libxml \ + vendor.qti.hardware.dsp@1.0 \ vendor.qti.hardware.qconfig@1.0 \ vendor.qti.hardware.vpp@1.1 \ vendor.qti.hardware.vpp@1.2 \ @@ -316,14 +327,10 @@ PRODUCT_PACKAGES += \ libcdfw \ libcdfw_remote_api \ libcdsp_default_listener \ - libcdsprpc \ libcne \ libcneapiclient \ libcneoplookup \ - libconfigdb \ libcpion \ - libcvp2_1 \ - libcvp_common \ libcvpcpuRev_skel \ libdataitems \ libdisp-aba \ @@ -333,8 +340,6 @@ PRODUCT_PACKAGES += \ libdpps \ libdrmfs \ libdrmtime \ - libfastcvdsp_stub \ - libfastcvopt \ libhdr_tm \ libhydra_common \ libizat_client_api \ @@ -352,7 +357,6 @@ PRODUCT_PACKAGES += \ liblowi_client \ liblowi_wifihal \ liblqe \ - libmdmdetect \ libmdsprpc \ libmeters \ libminkdescriptor \ @@ -360,7 +364,6 @@ PRODUCT_PACKAGES += \ libmlipay \ libmlipay@1.1 \ libmodemapi \ - libnetmgr \ libnetmgr_common \ libnetmgr_nr_fusion \ libnetmgr_rmnet_ext \ @@ -406,14 +409,12 @@ PRODUCT_PACKAGES += \ libssd \ libsynergy_loc_api \ libsystem_health_mon \ - libthermalclient \ libtime_genoff \ libtinyxml2_1 \ libtrustedapploader \ libwms \ libwqe \ libwvhidl \ - libxml \ libxtadapter \ ls_nq_client \ libwvdrmengine \ @@ -463,7 +464,6 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.data.latency@1.0 \ vendor.qti.hardware.data.lce@1.0 \ vendor.qti.hardware.data.qmi@1.0 \ - vendor.qti.hardware.dsp@1.0 \ vendor.qti.hardware.fm@1.0 \ vendor.qti.hardware.mwqemadapter@1.0 \ vendor.qti.hardware.qccsyshal@1.0 \