diff --git a/Android.bp b/Android.bp index 853d6b1..5cb6553 100644 --- a/Android.bp +++ b/Android.bp @@ -359,6 +359,64 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "android.hardware.bluetooth@1.0-impl-qti", + owner: "motorola", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so", + ], + shared_libs: [ + "libbase", + "libcutils", + "libhidlbase", + "liblog", + "libutils", + "libdiag", + "libqmiservices", + "libqmi_cci", + "libbtnv", + "android.hardware.bluetooth@1.0", + "libsoc_helper", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so", + ], + shared_libs: [ + "libbase", + "libcutils", + "libhidlbase", + "liblog", + "libutils", + "libdiag", + "libqmiservices", + "libqmi_cci", + "libbtnv", + "android.hardware.bluetooth@1.0", + "libsoc_helper", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + relative_install_path: "hw", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "vendor.qti.hardware.bluetooth_audio@2.0-impl", owner: "motorola", @@ -1338,6 +1396,41 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libbtnv", + owner: "motorola", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libbtnv.so", + ], + shared_libs: [ + "libc++", + "libc", + "libm", + "libdl", + ], + }, + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libbtnv.so", + ], + shared_libs: [ + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libc2d30_bltlib", owner: "motorola", @@ -1584,6 +1677,49 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libconfigdb", + owner: "motorola", + 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: "libcvp_common", owner: "motorola", @@ -2351,6 +2487,47 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libmdmdetect", + owner: "motorola", + 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: "libmdsprpc", owner: "motorola", @@ -2476,6 +2653,53 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libnetmgr", + owner: "motorola", + 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: "libqcci_legacy", owner: "motorola", @@ -3346,6 +3570,43 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libsoc_helper", + owner: "motorola", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libsoc_helper.so", + ], + shared_libs: [ + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libsoc_helper.so", + ], + shared_libs: [ + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libthermalclient", owner: "motorola", @@ -3385,6 +3646,47 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libxml", + owner: "motorola", + 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: "libasphere", owner: "motorola", @@ -4109,6 +4411,49 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.wifidisplaysession@1.0", + owner: "motorola", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so", + ], + shared_libs: [ + "libhidlbase", + "liblog", + "libutils", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/vendor.qti.hardware.wifidisplaysession@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: "libDxHdcp", owner: "motorola", @@ -5207,34 +5552,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.wifidisplaysession@1.0", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so", - ], - shared_libs: [ - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "32", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl", owner: "motorola", @@ -5561,42 +5878,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "android.hardware.bluetooth@1.0-impl-qti", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so", - ], - shared_libs: [ - "libbase", - "libcutils", - "libhidlbase", - "liblog", - "libutils", - "libdiag", - "libqmiservices", - "libqmi_cci", - "libbtnv", - "android.hardware.bluetooth@1.0", - "libsoc_helper", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "hw", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "android.hardware.gatekeeper@1.0-impl-qti", owner: "motorola", @@ -6683,30 +6964,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libbtnv", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libbtnv.so", - ], - shared_libs: [ - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcacertclient", owner: "motorola", @@ -6930,34 +7187,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libconfigdb", - owner: "motorola", - 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: "motorola", @@ -7986,33 +8215,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libmdmdetect", - owner: "motorola", - 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: "libminkdescriptor", owner: "motorola", @@ -8096,36 +8298,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libnetmgr", - owner: "motorola", - 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: "motorola", @@ -9639,31 +9811,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libsoc_helper", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libsoc_helper.so", - ], - shared_libs: [ - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libssc", owner: "motorola", @@ -10060,33 +10207,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libxml", - owner: "motorola", - 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: "motorola", @@ -15197,8 +15317,23 @@ cc_prebuilt_library_shared { "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..d203a15 Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so differ diff --git a/proprietary/vendor/etc/qcril_database/upgrade/config/6.0_config.sql b/proprietary/vendor/etc/qcril_database/upgrade/config/6.0_config.sql index 3a4c811..d178cf1 100644 --- a/proprietary/vendor/etc/qcril_database/upgrade/config/6.0_config.sql +++ b/proprietary/vendor/etc/qcril_database/upgrade/config/6.0_config.sql @@ -104,7 +104,7 @@ INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES("persist INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES("persist.vendor.radio.csg_info_avlbl", "0"); INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES("persist.vendor.radio.cs_srv_type", "0"); INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES("persist.vendor.radio.limit_rac_change", "0"); -INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES("persist.vendor.radio.poweron_opt", "0"); +INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES("persist.vendor.radio.poweron_opt", "1"); INSERT OR REPLACE INTO qcril_properties_table(property) VALUES("persist.vendor.radio.sglte_target"); INSERT OR REPLACE INTO qcril_properties_table(property) VALUES("persist.vendor.radio.nitz_plmn_0"); INSERT OR REPLACE INTO qcril_properties_table(property) VALUES("persist.vendor.radio.nitz_plmn_1"); diff --git a/proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so b/proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so new file mode 100644 index 0000000..85c0323 Binary files /dev/null and b/proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so differ diff --git a/proprietary/vendor/lib/libbtnv.so b/proprietary/vendor/lib/libbtnv.so new file mode 100644 index 0000000..f124bb0 Binary files /dev/null and b/proprietary/vendor/lib/libbtnv.so differ diff --git a/proprietary/vendor/lib/libconfigdb.so b/proprietary/vendor/lib/libconfigdb.so new file mode 100644 index 0000000..2be221c Binary files /dev/null and b/proprietary/vendor/lib/libconfigdb.so differ diff --git a/proprietary/vendor/lib/libmdmdetect.so b/proprietary/vendor/lib/libmdmdetect.so new file mode 100644 index 0000000..301d310 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..b1d18c0 Binary files /dev/null and b/proprietary/vendor/lib/libnetmgr.so differ diff --git a/proprietary/vendor/lib/libsoc_helper.so b/proprietary/vendor/lib/libsoc_helper.so new file mode 100644 index 0000000..7012d41 Binary files /dev/null and b/proprietary/vendor/lib/libsoc_helper.so differ diff --git a/proprietary/vendor/lib/libxml.so b/proprietary/vendor/lib/libxml.so new file mode 100644 index 0000000..b86fb74 Binary files /dev/null and b/proprietary/vendor/lib/libxml.so differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so new file mode 100644 index 0000000..9986b18 Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so differ diff --git a/sm6375-common-vendor.mk b/sm6375-common-vendor.mk index 1e4fee1..f34bc99 100644 --- a/sm6375-common-vendor.mk +++ b/sm6375-common-vendor.mk @@ -326,6 +326,7 @@ PRODUCT_PACKAGES += \ libGLESv2_adreno \ libq3dtools_adreno \ libq3dtools_esx \ + android.hardware.bluetooth@1.0-impl-qti \ vendor.qti.hardware.bluetooth_audio@2.0-impl \ vendor.qti.hardware.bluetooth_audio@2.1-impl \ vendor.qti.hardware.bluetooth_sar@1.1-impl \ @@ -346,12 +347,14 @@ PRODUCT_PACKAGES += \ libaudcal \ libbluetooth_audio_session_qti \ libbluetooth_audio_session_qti_2_1 \ + libbtnv \ libc2d30_bltlib \ libcapiv2svacnn \ libcapiv2svarnn \ libcapiv2vop \ libcdsp_default_listener \ libcdsprpc \ + libconfigdb \ libcvp_common \ libcvpcpuRev_skel \ libdiag \ @@ -371,9 +374,11 @@ PRODUCT_PACKAGES += \ liblistensoundmodel2 \ libllvm-glnext \ libllvm-qcom \ + libmdmdetect \ libmdsprpc \ libmmosal \ libmulawdec \ + libnetmgr \ libqcci_legacy \ libqcmaputils \ libqdi \ @@ -394,7 +399,9 @@ PRODUCT_PACKAGES += \ libscveObjectSegmentation_stub \ libscveObjectTracker \ libscveObjectTracker_stub \ + libsoc_helper \ libthermalclient \ + libxml \ libasphere \ libqcbassboost \ libqcreverb \ @@ -412,6 +419,7 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.vpp@1.2 \ vendor.qti.hardware.vpp@1.3 \ vendor.qti.hardware.vpp@2.0 \ + vendor.qti.hardware.wifidisplaysession@1.0 \ libDxHdcp \ libFileMux_proprietary \ libadm \ @@ -448,7 +456,6 @@ PRODUCT_PACKAGES += \ libwfdutils_proprietary \ libmmieffectswrapper \ libspeakerbundle \ - vendor.qti.hardware.wifidisplaysession@1.0 \ vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl \ com.qualcomm.qti.dpm.api@1.0_vendor \ com.qualcomm.qti.imscmservice@1.0 \ @@ -460,7 +467,6 @@ PRODUCT_PACKAGES += \ com.qualcomm.qti.uceservice@2.2 \ com.qualcomm.qti.uceservice@2.3 \ deviceInfoServiceModuleNr \ - android.hardware.bluetooth@1.0-impl-qti \ android.hardware.gatekeeper@1.0-impl-qti \ android.hardware.gnss@2.1-impl-qti \ com.dsi.ant@1.0-impl \ @@ -494,7 +500,6 @@ PRODUCT_PACKAGES += \ libasn1crtx \ libbatching \ libbt-hidlclient \ - libbtnv \ libcacertclient \ libcdfw \ libcdfw_remote_api \ @@ -502,7 +507,6 @@ PRODUCT_PACKAGES += \ libcneapiclient \ libcneoplookup \ libcneqmiutils \ - libconfigdb \ libcpion \ libdataitems \ libdisp-aba \ @@ -538,11 +542,9 @@ PRODUCT_PACKAGES += \ liblowi_wifihal \ liblqe \ libmdmcutback \ - libmdmdetect \ libminkdescriptor \ libminksocket \ libmotext_inf \ - libnetmgr \ libnetmgr_common \ libnetmgr_nr_fusion \ libnetmgr_rmnet_ext \ @@ -593,7 +595,6 @@ PRODUCT_PACKAGES += \ libsns_low_lat_stream_stub \ libsnsapi \ libsnsdiaglog \ - libsoc_helper \ libssc \ libssc_default_listener \ libssd \ @@ -607,7 +608,6 @@ PRODUCT_PACKAGES += \ libwms \ libwqe \ libwvhidl \ - libxml \ libxtadapter \ libxtwifi_server_protocol \ libxtwifi_server_protocol_uri_v3 \