diff --git a/Android.bp b/Android.bp index a008008..7ec2f27 100644 --- a/Android.bp +++ b/Android.bp @@ -8861,8 +8861,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "libmmosal_system_ext", - stem: "libmmosal", + name: "libmmosal", owner: "xiaomi", strip: { none: true, @@ -8941,6 +8940,26 @@ cc_prebuilt_library_shared { system_ext_specific: true, } +cc_prebuilt_library_shared { + name: "libwfdclient", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/system_ext/lib/libwfdclient.so"], + }, + android_arm64: { + srcs: ["proprietary/system_ext/lib64/libwfdclient.so"], + }, + }, + compile_multilib: "both", + check_elf_files: false, + prefer: true, + system_ext_specific: true, +} + cc_prebuilt_library_shared { name: "libwfdcommonutils", owner: "xiaomi", @@ -9181,6 +9200,23 @@ cc_prebuilt_library_shared { system_ext_specific: true, } +cc_prebuilt_library_shared { + name: "com.qualcomm.qti.wifidisplayhal@1.0", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so"], + }, + }, + compile_multilib: "32", + check_elf_files: false, + prefer: true, + system_ext_specific: true, +} + cc_prebuilt_library_shared { name: "libwfdavenhancements", owner: "xiaomi", @@ -9233,8 +9269,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.hardware.wifidisplaysession@1.0_system_ext", - stem: "vendor.qti.hardware.wifidisplaysession@1.0", + name: "vendor.qti.hardware.wifidisplaysession@1.0", owner: "xiaomi", strip: { none: true, @@ -9489,23 +9524,6 @@ cc_prebuilt_library_shared { system_ext_specific: true, } -cc_prebuilt_library_shared { - name: "libwfdclient", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/system_ext/lib64/libwfdclient.so"], - }, - }, - compile_multilib: "64", - check_elf_files: false, - prefer: true, - system_ext_specific: true, -} - cc_prebuilt_library_shared { name: "libwfdnative", owner: "xiaomi", diff --git a/proprietary/system/framework/WfdCommon.jar b/proprietary/system/framework/WfdCommon.jar index 9640c50..7d3ef5f 100644 Binary files a/proprietary/system/framework/WfdCommon.jar and b/proprietary/system/framework/WfdCommon.jar differ diff --git a/proprietary/system_ext/bin/wfdservice b/proprietary/system_ext/bin/wfdservice index ed9def1..76ecdac 100755 Binary files a/proprietary/system_ext/bin/wfdservice and b/proprietary/system_ext/bin/wfdservice differ diff --git a/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml b/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml deleted file mode 100644 index 47462f8..0000000 --- a/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so b/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so new file mode 100644 index 0000000..8aaa5f6 Binary files /dev/null and b/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so differ diff --git a/proprietary/system_ext/lib/libmmosal.so b/proprietary/system_ext/lib/libmmosal.so index f255e0e..b41c773 100644 Binary files a/proprietary/system_ext/lib/libmmosal.so and b/proprietary/system_ext/lib/libmmosal.so differ diff --git a/proprietary/system_ext/lib/libmmparser_lite.so b/proprietary/system_ext/lib/libmmparser_lite.so index 2d54896..1392616 100644 Binary files a/proprietary/system_ext/lib/libmmparser_lite.so and b/proprietary/system_ext/lib/libmmparser_lite.so differ diff --git a/proprietary/system_ext/lib/libmmrtpdecoder.so b/proprietary/system_ext/lib/libmmrtpdecoder.so index 6d2cf5c..de0cbbd 100644 Binary files a/proprietary/system_ext/lib/libmmrtpdecoder.so and b/proprietary/system_ext/lib/libmmrtpdecoder.so differ diff --git a/proprietary/system_ext/lib/libmmrtpencoder.so b/proprietary/system_ext/lib/libmmrtpencoder.so index 07b3f72..5adeb59 100644 Binary files a/proprietary/system_ext/lib/libmmrtpencoder.so and b/proprietary/system_ext/lib/libmmrtpencoder.so differ diff --git a/proprietary/system_ext/lib/libwfdavenhancements.so b/proprietary/system_ext/lib/libwfdavenhancements.so index cd68cad..b2bdcd9 100644 Binary files a/proprietary/system_ext/lib/libwfdavenhancements.so and b/proprietary/system_ext/lib/libwfdavenhancements.so differ diff --git a/proprietary/system_ext/lib/libwfdclient.so b/proprietary/system_ext/lib/libwfdclient.so new file mode 100644 index 0000000..f03a083 Binary files /dev/null and b/proprietary/system_ext/lib/libwfdclient.so differ diff --git a/proprietary/system_ext/lib/libwfdcommonutils.so b/proprietary/system_ext/lib/libwfdcommonutils.so index 2a815f1..69dc844 100644 Binary files a/proprietary/system_ext/lib/libwfdcommonutils.so and b/proprietary/system_ext/lib/libwfdcommonutils.so differ diff --git a/proprietary/system_ext/lib/libwfdconfigutils.so b/proprietary/system_ext/lib/libwfdconfigutils.so index 1b92f31..ed25f90 100644 Binary files a/proprietary/system_ext/lib/libwfdconfigutils.so and b/proprietary/system_ext/lib/libwfdconfigutils.so differ diff --git a/proprietary/system_ext/lib/libwfddisplayconfig.so b/proprietary/system_ext/lib/libwfddisplayconfig.so index d58f4a3..6cf67fd 100644 Binary files a/proprietary/system_ext/lib/libwfddisplayconfig.so and b/proprietary/system_ext/lib/libwfddisplayconfig.so differ diff --git a/proprietary/system_ext/lib/libwfdmminterface.so b/proprietary/system_ext/lib/libwfdmminterface.so index c65b930..9fc01bf 100644 Binary files a/proprietary/system_ext/lib/libwfdmminterface.so and b/proprietary/system_ext/lib/libwfdmminterface.so differ diff --git a/proprietary/system_ext/lib/libwfdmmsink.so b/proprietary/system_ext/lib/libwfdmmsink.so index 00d6213..8855ea4 100644 Binary files a/proprietary/system_ext/lib/libwfdmmsink.so and b/proprietary/system_ext/lib/libwfdmmsink.so differ diff --git a/proprietary/system_ext/lib/libwfdmmsrc_system.so b/proprietary/system_ext/lib/libwfdmmsrc_system.so index ad6bb4a..437b794 100644 Binary files a/proprietary/system_ext/lib/libwfdmmsrc_system.so and b/proprietary/system_ext/lib/libwfdmmsrc_system.so differ diff --git a/proprietary/system_ext/lib/libwfdrtsp.so b/proprietary/system_ext/lib/libwfdrtsp.so index 88c0c2d..cf190f3 100644 Binary files a/proprietary/system_ext/lib/libwfdrtsp.so and b/proprietary/system_ext/lib/libwfdrtsp.so differ diff --git a/proprietary/system_ext/lib/libwfdservice.so b/proprietary/system_ext/lib/libwfdservice.so index dcc1033..f77a006 100644 Binary files a/proprietary/system_ext/lib/libwfdservice.so and b/proprietary/system_ext/lib/libwfdservice.so differ diff --git a/proprietary/system_ext/lib/libwfdsinksm.so b/proprietary/system_ext/lib/libwfdsinksm.so index a400947..cdd0268 100644 Binary files a/proprietary/system_ext/lib/libwfdsinksm.so and b/proprietary/system_ext/lib/libwfdsinksm.so differ diff --git a/proprietary/system_ext/lib/libwfduibcinterface.so b/proprietary/system_ext/lib/libwfduibcinterface.so index 52985c0..92699f4 100644 Binary files a/proprietary/system_ext/lib/libwfduibcinterface.so and b/proprietary/system_ext/lib/libwfduibcinterface.so differ diff --git a/proprietary/system_ext/lib/libwfduibcsink.so b/proprietary/system_ext/lib/libwfduibcsink.so index 80630e1..5898d12 100644 Binary files a/proprietary/system_ext/lib/libwfduibcsink.so and b/proprietary/system_ext/lib/libwfduibcsink.so differ diff --git a/proprietary/system_ext/lib/libwfduibcsinkinterface.so b/proprietary/system_ext/lib/libwfduibcsinkinterface.so index df1d0cf..110b830 100644 Binary files a/proprietary/system_ext/lib/libwfduibcsinkinterface.so and b/proprietary/system_ext/lib/libwfduibcsinkinterface.so differ diff --git a/proprietary/system_ext/lib/libwfduibcsrc.so b/proprietary/system_ext/lib/libwfduibcsrc.so index f8087d6..9651d85 100644 Binary files a/proprietary/system_ext/lib/libwfduibcsrc.so and b/proprietary/system_ext/lib/libwfduibcsrc.so differ diff --git a/proprietary/system_ext/lib/libwfduibcsrcinterface.so b/proprietary/system_ext/lib/libwfduibcsrcinterface.so index b1740f8..63bc951 100644 Binary files a/proprietary/system_ext/lib/libwfduibcsrcinterface.so and b/proprietary/system_ext/lib/libwfduibcsrcinterface.so differ diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so index 94a87d1..b30a625 100644 Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so and b/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so differ diff --git a/proprietary/system_ext/lib64/libmmosal.so b/proprietary/system_ext/lib64/libmmosal.so index a7d5ff7..e6e553c 100644 Binary files a/proprietary/system_ext/lib64/libmmosal.so and b/proprietary/system_ext/lib64/libmmosal.so differ diff --git a/proprietary/system_ext/lib64/libmmparser_lite.so b/proprietary/system_ext/lib64/libmmparser_lite.so index 43026ca..ef3d5b2 100644 Binary files a/proprietary/system_ext/lib64/libmmparser_lite.so and b/proprietary/system_ext/lib64/libmmparser_lite.so differ diff --git a/proprietary/system_ext/lib64/libmmrtpdecoder.so b/proprietary/system_ext/lib64/libmmrtpdecoder.so index daa3643..fdb529d 100644 Binary files a/proprietary/system_ext/lib64/libmmrtpdecoder.so and b/proprietary/system_ext/lib64/libmmrtpdecoder.so differ diff --git a/proprietary/system_ext/lib64/libmmrtpencoder.so b/proprietary/system_ext/lib64/libmmrtpencoder.so index 9bee6f1..7505715 100644 Binary files a/proprietary/system_ext/lib64/libmmrtpencoder.so and b/proprietary/system_ext/lib64/libmmrtpencoder.so differ diff --git a/proprietary/system_ext/lib64/libwfdclient.so b/proprietary/system_ext/lib64/libwfdclient.so index eeaaa53..02147ce 100644 Binary files a/proprietary/system_ext/lib64/libwfdclient.so and b/proprietary/system_ext/lib64/libwfdclient.so differ diff --git a/proprietary/system_ext/lib64/libwfdcommonutils.so b/proprietary/system_ext/lib64/libwfdcommonutils.so index d0c0b50..cc9d53b 100644 Binary files a/proprietary/system_ext/lib64/libwfdcommonutils.so and b/proprietary/system_ext/lib64/libwfdcommonutils.so differ diff --git a/proprietary/system_ext/lib64/libwfdconfigutils.so b/proprietary/system_ext/lib64/libwfdconfigutils.so index 5dc02a8..5663472 100644 Binary files a/proprietary/system_ext/lib64/libwfdconfigutils.so and b/proprietary/system_ext/lib64/libwfdconfigutils.so differ diff --git a/proprietary/system_ext/lib64/libwfddisplayconfig.so b/proprietary/system_ext/lib64/libwfddisplayconfig.so index 086e5c0..d587503 100644 Binary files a/proprietary/system_ext/lib64/libwfddisplayconfig.so and b/proprietary/system_ext/lib64/libwfddisplayconfig.so differ diff --git a/proprietary/system_ext/lib64/libwfdmminterface.so b/proprietary/system_ext/lib64/libwfdmminterface.so index 7434caa..5bd734c 100644 Binary files a/proprietary/system_ext/lib64/libwfdmminterface.so and b/proprietary/system_ext/lib64/libwfdmminterface.so differ diff --git a/proprietary/system_ext/lib64/libwfdmmsink.so b/proprietary/system_ext/lib64/libwfdmmsink.so index 2e0b835..c274b6a 100644 Binary files a/proprietary/system_ext/lib64/libwfdmmsink.so and b/proprietary/system_ext/lib64/libwfdmmsink.so differ diff --git a/proprietary/system_ext/lib64/libwfdnative.so b/proprietary/system_ext/lib64/libwfdnative.so index 7945796..09fad87 100644 Binary files a/proprietary/system_ext/lib64/libwfdnative.so and b/proprietary/system_ext/lib64/libwfdnative.so differ diff --git a/proprietary/system_ext/lib64/libwfdrtsp.so b/proprietary/system_ext/lib64/libwfdrtsp.so index 5b66f11..16cf3a1 100644 Binary files a/proprietary/system_ext/lib64/libwfdrtsp.so and b/proprietary/system_ext/lib64/libwfdrtsp.so differ diff --git a/proprietary/system_ext/lib64/libwfdsinksm.so b/proprietary/system_ext/lib64/libwfdsinksm.so index 25f47cc..75c86bb 100644 Binary files a/proprietary/system_ext/lib64/libwfdsinksm.so and b/proprietary/system_ext/lib64/libwfdsinksm.so differ diff --git a/proprietary/system_ext/lib64/libwfduibcinterface.so b/proprietary/system_ext/lib64/libwfduibcinterface.so index f78e6d1..8fc7422 100644 Binary files a/proprietary/system_ext/lib64/libwfduibcinterface.so and b/proprietary/system_ext/lib64/libwfduibcinterface.so differ diff --git a/proprietary/system_ext/lib64/libwfduibcsink.so b/proprietary/system_ext/lib64/libwfduibcsink.so index 0773262..301b04f 100644 Binary files a/proprietary/system_ext/lib64/libwfduibcsink.so and b/proprietary/system_ext/lib64/libwfduibcsink.so differ diff --git a/proprietary/system_ext/lib64/libwfduibcsinkinterface.so b/proprietary/system_ext/lib64/libwfduibcsinkinterface.so index 51b1a5d..83af361 100644 Binary files a/proprietary/system_ext/lib64/libwfduibcsinkinterface.so and b/proprietary/system_ext/lib64/libwfduibcsinkinterface.so differ diff --git a/proprietary/system_ext/lib64/libwfduibcsrc.so b/proprietary/system_ext/lib64/libwfduibcsrc.so index 89a15b5..f2d0ad2 100644 Binary files a/proprietary/system_ext/lib64/libwfduibcsrc.so and b/proprietary/system_ext/lib64/libwfduibcsrc.so differ diff --git a/proprietary/system_ext/lib64/libwfduibcsrcinterface.so b/proprietary/system_ext/lib64/libwfduibcsrcinterface.so index 1156d0d..9a7198a 100644 Binary files a/proprietary/system_ext/lib64/libwfduibcsrcinterface.so and b/proprietary/system_ext/lib64/libwfduibcsrcinterface.so differ diff --git a/proprietary/system_ext/priv-app/WfdService/WfdService.apk b/proprietary/system_ext/priv-app/WfdService/WfdService.apk index c54ade4..896c82a 100644 Binary files a/proprietary/system_ext/priv-app/WfdService/WfdService.apk and b/proprietary/system_ext/priv-app/WfdService/WfdService.apk differ diff --git a/surya-vendor.mk b/surya-vendor.mk index 716b75d..4ab3024 100644 --- a/surya-vendor.mk +++ b/surya-vendor.mk @@ -14,7 +14,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \ vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \ vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \ - vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml \ vendor/xiaomi/surya/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice.policy \ vendor/xiaomi/surya/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \ vendor/xiaomi/surya/proprietary/vendor/etc/acdbdata/IDP/IDP_Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/IDP/IDP_Bluetooth_cal.acdb \ @@ -785,10 +784,11 @@ PRODUCT_PACKAGES += \ vendor.qti.imsrtpservice@3.0_vendor \ vendor.qti.latency@2.0 \ vendor.qti.latency@2.1 \ - libmmosal_system_ext \ + libmmosal \ libmmparser_lite \ libmmrtpdecoder \ libmmrtpencoder \ + libwfdclient \ libwfdcommonutils \ libwfdconfigutils \ libwfddisplayconfig \ @@ -801,10 +801,11 @@ PRODUCT_PACKAGES += \ libwfduibcsinkinterface \ libwfduibcsrc \ libwfduibcsrcinterface \ + com.qualcomm.qti.wifidisplayhal@1.0 \ libwfdavenhancements \ libwfdmmsrc_system \ libwfdservice \ - vendor.qti.hardware.wifidisplaysession@1.0_system_ext \ + vendor.qti.hardware.wifidisplaysession@1.0 \ com.qualcomm.qti.dpm.api@1.0_system_ext \ fm_helium \ lib-imsvideocodec \ @@ -819,7 +820,6 @@ PRODUCT_PACKAGES += \ libfm-hci \ libimscamera_jni \ libimsmedia_jni \ - libwfdclient \ libwfdnative \ vendor.qti.diaghal@1.0 \ vendor.qti.hardware.fm@1.0_system_ext \