diff --git a/Android.bp b/Android.bp
index 47abe00..e1fda3c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13811,1092 +13811,6 @@ cc_prebuilt_library_shared {
system_ext_specific: true,
}
-cc_prebuilt_library_shared {
- name: "libmmosal",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libmmosal.so",
- ],
- shared_libs: [
- "libutils",
- "libcutils",
- "liblog",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libmmosal.so",
- ],
- shared_libs: [
- "libutils",
- "libcutils",
- "liblog",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libmmparser_lite",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libmmparser_lite.so",
- ],
- shared_libs: [
- "libutils",
- "libcutils",
- "liblog",
- "libmmosal",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libmmparser_lite.so",
- ],
- shared_libs: [
- "libutils",
- "libcutils",
- "liblog",
- "libmmosal",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libmmrtpdecoder",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libmmrtpdecoder.so",
- ],
- shared_libs: [
- "libutils",
- "liblog",
- "libcutils",
- "libmmosal",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libmmrtpdecoder.so",
- ],
- shared_libs: [
- "libutils",
- "liblog",
- "libcutils",
- "libmmosal",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libmmrtpencoder",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libmmrtpencoder.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libmmrtpencoder.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfdavenhancements",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfdavenhancements.so",
- ],
- shared_libs: [
- "liblog",
- "libbinder",
- "libutils",
- "libgui",
- "libui",
- "libstagefright_foundation",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfdavenhancements.so",
- ],
- shared_libs: [
- "liblog",
- "libbinder",
- "libutils",
- "libgui",
- "libui",
- "libstagefright_foundation",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfdclient",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfdclient.so",
- ],
- shared_libs: [
- "liblog",
- "libutils",
- "libcutils",
- "libbinder",
- "libgui",
- "libmmosal",
- "libinput",
- "libwfdsinksm",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libwfdmminterface",
- "libnativewindow",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfdclient.so",
- ],
- shared_libs: [
- "liblog",
- "libutils",
- "libcutils",
- "libbinder",
- "libgui",
- "libmmosal",
- "libinput",
- "libwfdsinksm",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libwfdmminterface",
- "libnativewindow",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfdcommonutils",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfdcommonutils.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libbinder",
- "libnl",
- "libwfdmminterface",
- "libwfdconfigutils",
- "libui",
- "libgui",
- "libwfddisplayconfig",
- "libion",
- "libprocessgroup",
- "libdng_sdk",
- "libjpeg",
- "libpiex",
- "libpng",
- "libheif",
- "libnativewindow",
- "libEGL",
- "libGLESv2",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfdcommonutils.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libbinder",
- "libnl",
- "libwfdmminterface",
- "libwfdconfigutils",
- "libui",
- "libgui",
- "libwfddisplayconfig",
- "libion",
- "libprocessgroup",
- "libdng_sdk",
- "libjpeg",
- "libpiex",
- "libpng",
- "libheif",
- "libnativewindow",
- "libEGL",
- "libGLESv2",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfdconfigutils",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfdconfigutils.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libbinder",
- "libnl",
- "libwfdmminterface",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfdconfigutils.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libbinder",
- "libnl",
- "libwfdmminterface",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfddisplayconfig",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfddisplayconfig.so",
- ],
- shared_libs: [
- "libhidlbase",
- "libutils",
- "libcutils",
- "liblog",
- "vendor.display.config@2.0",
- "libdisplayconfig.system.qti",
- "libbinder_ndk",
- "vendor.qti.hardware.display.config-V5-ndk",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfddisplayconfig.so",
- ],
- shared_libs: [
- "libhidlbase",
- "libutils",
- "libcutils",
- "liblog",
- "vendor.display.config@2.0",
- "libdisplayconfig.system.qti",
- "libbinder_ndk",
- "vendor.qti.hardware.display.config-V5-ndk",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfdmminterface",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfdmminterface.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfdmminterface.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfdmmsink",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfdmmsink.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libmedia",
- "libaudioclient",
- "libgui",
- "libbinder",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libui",
- "libmmparser_lite",
- "libmmrtpdecoder",
- "libcutils",
- "libwfddisplayconfig",
- "libhwui",
- "libwfdmminterface",
- "libhidlbase",
- "libhidlmemory",
- "android.hidl.allocator@1.0",
- "android.hidl.memory@1.0",
- "libandroid",
- "libmediandk",
- "libaaudio",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfdmmsink.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libmedia",
- "libaudioclient",
- "libgui",
- "libbinder",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libui",
- "libmmparser_lite",
- "libmmrtpdecoder",
- "libcutils",
- "libwfddisplayconfig",
- "libhwui",
- "libwfdmminterface",
- "libhidlbase",
- "libhidlmemory",
- "android.hidl.allocator@1.0",
- "android.hidl.memory@1.0",
- "libandroid",
- "libmediandk",
- "libaaudio",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfdmmsrc_system",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfdmmsrc_system.so",
- ],
- shared_libs: [
- "libgui_shim",
- "libbinder",
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libgui",
- "libui",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libinput",
- "libwfdmminterface",
- "libwfddisplayconfig",
- "libmedia_helper",
- "libaudioclient",
- "libwfdavenhancements",
- "libhidlbase",
- "libgralloctypes",
- "android.hardware.graphics.mapper@4.0",
- "libvndksupport",
- "android.hardware.graphics.allocator@4.0",
- "android.hardware.graphics.allocator-V2-ndk",
- "libbinder_ndk",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfdmmsrc_system.so",
- ],
- shared_libs: [
- "libgui_shim",
- "libbinder",
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libgui",
- "libui",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libinput",
- "libwfdmminterface",
- "libwfddisplayconfig",
- "libmedia_helper",
- "libaudioclient",
- "libwfdavenhancements",
- "libhidlbase",
- "libgralloctypes",
- "android.hardware.graphics.mapper@4.0",
- "libvndksupport",
- "android.hardware.graphics.allocator@4.0",
- "android.hardware.graphics.allocator-V2-ndk",
- "libbinder_ndk",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfdrtsp",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfdrtsp.so",
- ],
- shared_libs: [
- "libc++",
- "libcutils",
- "libutils",
- "libmmosal",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "liblog",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfdrtsp.so",
- ],
- shared_libs: [
- "libc++",
- "libcutils",
- "libutils",
- "libmmosal",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "liblog",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfdservice",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfdservice.so",
- ],
- shared_libs: [
- "liblog",
- "libutils",
- "libcutils",
- "libbinder",
- "libgui",
- "libwfdsinksm",
- "libmmosal",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libinput",
- "libwfdmminterface",
- "libmedia_helper",
- "libaudioclient",
- "libaudiofoundation",
- "audioclient-types-aidl-cpp",
- "android.media.audio.common.types-V4-cpp",
- "libwfdmmsrc_system",
- "libwfdavenhancements",
- "libhidlbase",
- "vendor.qti.hardware.wifidisplaysession@1.0",
- "vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk",
- "libbinder_ndk",
- "android.hardware.common-V2-ndk_platform",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfdservice.so",
- ],
- shared_libs: [
- "liblog",
- "libutils",
- "libcutils",
- "libbinder",
- "libgui",
- "libwfdsinksm",
- "libmmosal",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libinput",
- "libwfdmminterface",
- "libmedia_helper",
- "libaudioclient",
- "libaudiofoundation",
- "audioclient-types-aidl-cpp",
- "android.media.audio.common.types-V4-cpp",
- "libwfdmmsrc_system",
- "libwfdavenhancements",
- "libhidlbase",
- "vendor.qti.hardware.wifidisplaysession@1.0",
- "vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk",
- "libbinder_ndk",
- "android.hardware.common-V2-ndk_platform",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfdsinksm",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfdsinksm.so",
- ],
- shared_libs: [
- "libc++",
- "libcutils",
- "libutils",
- "libwfdrtsp",
- "libwfduibcinterface",
- "libwfdmmsink",
- "libmmosal",
- "libmedia",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libwfdmminterface",
- "libmmrtpencoder",
- "libmmrtpdecoder",
- "libhidlbase",
- "libnativewindow",
- "libmediandk",
- "liblog",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfdsinksm.so",
- ],
- shared_libs: [
- "libc++",
- "libcutils",
- "libutils",
- "libwfdrtsp",
- "libwfduibcinterface",
- "libwfdmmsink",
- "libmmosal",
- "libmedia",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libwfdmminterface",
- "libmmrtpencoder",
- "libmmrtpdecoder",
- "libhidlbase",
- "libnativewindow",
- "libmediandk",
- "liblog",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfduibcinterface",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfduibcinterface.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libwfduibcsrcinterface",
- "libwfduibcsinkinterface",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfduibcinterface.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libwfduibcsrcinterface",
- "libwfduibcsinkinterface",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfduibcsink",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfduibcsink.so",
- ],
- shared_libs: [
- "libmmosal",
- "libutils",
- "liblog",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfduibcsink.so",
- ],
- shared_libs: [
- "libmmosal",
- "libutils",
- "liblog",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfduibcsinkinterface",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfduibcsinkinterface.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libwfduibcsink",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfduibcsinkinterface.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libwfduibcsink",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfduibcsrc",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfduibcsrc.so",
- ],
- shared_libs: [
- "libmmosal",
- "libwfdcommonutils",
- "liblog",
- "libutils",
- "libcutils",
- "libwfdconfigutils",
- "libwfddisplayconfig",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfduibcsrc.so",
- ],
- shared_libs: [
- "libmmosal",
- "libwfdcommonutils",
- "liblog",
- "libutils",
- "libcutils",
- "libwfdconfigutils",
- "libwfddisplayconfig",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libwfduibcsrcinterface",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/libwfduibcsrcinterface.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libwfduibcsrc",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/libwfduibcsrcinterface.so",
- ],
- shared_libs: [
- "libmmosal",
- "liblog",
- "libutils",
- "libcutils",
- "libwfduibcsrc",
- "libwfdcommonutils",
- "libwfdconfigutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "vendor.qti.diaghal@1.0",
owner: "motorola",
@@ -14940,88 +13854,6 @@ cc_prebuilt_library_shared {
system_ext_specific: true,
}
-cc_prebuilt_library_shared {
- name: "vendor.qti.hardware.wifidisplaysession@1.0",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- 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: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk",
- owner: "motorola",
- strip: {
- none: true,
- },
- target: {
- android_arm: {
- srcs: [
- "proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so",
- ],
- shared_libs: [
- "libbinder_ndk",
- "android.hardware.common-V2-ndk",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- android_arm64: {
- srcs: [
- "proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so",
- ],
- shared_libs: [
- "libbinder_ndk",
- "android.hardware.common-V2-ndk",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "both",
- prefer: true,
- system_ext_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "com.qualcomm.qti.dpm.api@1.0",
owner: "motorola",
@@ -15400,6 +14232,117 @@ cc_prebuilt_library_shared {
system_ext_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "libmmosal",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libmmosal.so",
+ ],
+ shared_libs: [
+ "libutils",
+ "libcutils",
+ "liblog",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libmmparser_lite",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libmmparser_lite.so",
+ ],
+ shared_libs: [
+ "libutils",
+ "libcutils",
+ "liblog",
+ "libmmosal",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libmmrtpdecoder",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libmmrtpdecoder.so",
+ ],
+ shared_libs: [
+ "libutils",
+ "liblog",
+ "libcutils",
+ "libmmosal",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libmmrtpencoder",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libmmrtpencoder.so",
+ ],
+ shared_libs: [
+ "libmmosal",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
cc_prebuilt_library_shared {
name: "libqspmsvc",
owner: "motorola",
@@ -15428,6 +14371,300 @@ cc_prebuilt_library_shared {
system_ext_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "libwfdavenhancements",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfdavenhancements.so",
+ ],
+ shared_libs: [
+ "liblog",
+ "libbinder",
+ "libutils",
+ "libgui",
+ "libui",
+ "libstagefright_foundation",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfdclient",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfdclient.so",
+ ],
+ shared_libs: [
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libbinder",
+ "libgui",
+ "libmmosal",
+ "libinput",
+ "libwfdsinksm",
+ "libwfdcommonutils",
+ "libwfdconfigutils",
+ "libwfdmminterface",
+ "libnativewindow",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfdcommonutils",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfdcommonutils.so",
+ ],
+ shared_libs: [
+ "libmmosal",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libbinder",
+ "libnl",
+ "libwfdmminterface",
+ "libwfdconfigutils",
+ "libui",
+ "libgui",
+ "libwfddisplayconfig",
+ "libion",
+ "libprocessgroup",
+ "libdng_sdk",
+ "libjpeg",
+ "libpiex",
+ "libpng",
+ "libheif",
+ "libnativewindow",
+ "libEGL",
+ "libGLESv2",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfdconfigutils",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfdconfigutils.so",
+ ],
+ shared_libs: [
+ "libmmosal",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libbinder",
+ "libnl",
+ "libwfdmminterface",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfddisplayconfig",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfddisplayconfig.so",
+ ],
+ shared_libs: [
+ "libhidlbase",
+ "libutils",
+ "libcutils",
+ "liblog",
+ "vendor.display.config@2.0",
+ "libdisplayconfig.system.qti",
+ "libbinder_ndk",
+ "vendor.qti.hardware.display.config-V5-ndk",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfdmminterface",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfdmminterface.so",
+ ],
+ shared_libs: [
+ "libmmosal",
+ "liblog",
+ "libutils",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfdmmsink",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfdmmsink.so",
+ ],
+ shared_libs: [
+ "libmmosal",
+ "liblog",
+ "libutils",
+ "libmedia",
+ "libaudioclient",
+ "libgui",
+ "libbinder",
+ "libwfdcommonutils",
+ "libwfdconfigutils",
+ "libui",
+ "libmmparser_lite",
+ "libmmrtpdecoder",
+ "libcutils",
+ "libwfddisplayconfig",
+ "libhwui",
+ "libwfdmminterface",
+ "libhidlbase",
+ "libhidlmemory",
+ "android.hidl.allocator@1.0",
+ "android.hidl.memory@1.0",
+ "libandroid",
+ "libmediandk",
+ "libaaudio",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfdmmsrc_system",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfdmmsrc_system.so",
+ ],
+ shared_libs: [
+ "libbinder",
+ "libmmosal",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libgui",
+ "libui",
+ "libwfdcommonutils",
+ "libwfdconfigutils",
+ "libinput",
+ "libwfdmminterface",
+ "libwfddisplayconfig",
+ "libmedia_helper",
+ "libaudioclient",
+ "libwfdavenhancements",
+ "libhidlbase",
+ "libgralloctypes",
+ "android.hardware.graphics.mapper@4.0",
+ "libvndksupport",
+ "android.hardware.graphics.allocator@4.0",
+ "android.hardware.graphics.allocator-V2-ndk",
+ "libbinder_ndk",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
cc_prebuilt_library_shared {
name: "libwfdnative",
owner: "motorola",
@@ -15440,12 +14677,8 @@ cc_prebuilt_library_shared {
"proprietary/system_ext/lib64/libwfdnative.so",
],
shared_libs: [
- "libinput_shim",
- "libbinder_shim",
"libandroid_runtime",
- "libgui",
"libui",
- "libbinder",
"libinput",
"libnativehelper",
"libutils",
@@ -15453,6 +14686,8 @@ cc_prebuilt_library_shared {
"libwfdclient",
"libhidlbase",
"libhidlmemory",
+ "libbinder",
+ "libgui",
"android.hidl.base@1.0",
"android.hidl.token@1.0-utils",
"android.hardware.graphics.common@1.0",
@@ -15470,6 +14705,274 @@ cc_prebuilt_library_shared {
system_ext_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "libwfdrtsp",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfdrtsp.so",
+ ],
+ shared_libs: [
+ "libc++",
+ "libcutils",
+ "libutils",
+ "libmmosal",
+ "libwfdcommonutils",
+ "libwfdconfigutils",
+ "liblog",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfdservice",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfdservice.so",
+ ],
+ shared_libs: [
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libbinder",
+ "libgui",
+ "libwfdsinksm",
+ "libmmosal",
+ "libwfdcommonutils",
+ "libwfdconfigutils",
+ "libinput",
+ "libwfdmminterface",
+ "libmedia_helper",
+ "libaudioclient",
+ "libaudiofoundation",
+ "audioclient-types-aidl-cpp",
+ "android.media.audio.common.types-V4-cpp",
+ "libwfdmmsrc_system",
+ "libwfdavenhancements",
+ "libhidlbase",
+ "vendor.qti.hardware.wifidisplaysession@1.0",
+ "vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk",
+ "libbinder_ndk",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfdsinksm",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfdsinksm.so",
+ ],
+ shared_libs: [
+ "libc++",
+ "libcutils",
+ "libutils",
+ "libwfdrtsp",
+ "libwfduibcinterface",
+ "libwfdmmsink",
+ "libmmosal",
+ "libmedia",
+ "libwfdcommonutils",
+ "libwfdconfigutils",
+ "libwfdmminterface",
+ "libmmrtpencoder",
+ "libmmrtpdecoder",
+ "libhidlbase",
+ "libnativewindow",
+ "libmediandk",
+ "liblog",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfduibcinterface",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfduibcinterface.so",
+ ],
+ shared_libs: [
+ "libmmosal",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libwfduibcsrcinterface",
+ "libwfduibcsinkinterface",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfduibcsink",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfduibcsink.so",
+ ],
+ shared_libs: [
+ "libmmosal",
+ "libutils",
+ "liblog",
+ "libcutils",
+ "libwfdconfigutils",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfduibcsinkinterface",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfduibcsinkinterface.so",
+ ],
+ shared_libs: [
+ "libmmosal",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libwfduibcsink",
+ "libwfdcommonutils",
+ "libwfdconfigutils",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfduibcsrc",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfduibcsrc.so",
+ ],
+ shared_libs: [
+ "libmmosal",
+ "libwfdcommonutils",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libwfdconfigutils",
+ "libwfddisplayconfig",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libwfduibcsrcinterface",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/libwfduibcsrcinterface.so",
+ ],
+ shared_libs: [
+ "libmmosal",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libwfduibcsrc",
+ "libwfdcommonutils",
+ "libwfdconfigutils",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
cc_prebuilt_library_shared {
name: "vendor.qti.ImsRtpService-V1-ndk",
owner: "motorola",
@@ -15550,6 +15053,60 @@ cc_prebuilt_library_shared {
system_ext_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "vendor.qti.hardware.wifidisplaysession@1.0",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ 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: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk",
+ owner: "motorola",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so",
+ ],
+ shared_libs: [
+ "libbinder_ndk",
+ "android.hardware.common-V2-ndk",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ system_ext_specific: true,
+}
+
cc_prebuilt_library_shared {
name: "vendor.qti.imsrtpservice@3.0",
owner: "motorola",
@@ -18157,12 +17714,11 @@ cc_prebuilt_binary {
name: "wfdservice",
owner: "motorola",
target: {
- android_arm: {
+ android_arm64: {
srcs: [
"proprietary/system_ext/bin/wfdservice",
],
shared_libs: [
- "libwfdservice_shim",
"liblog",
"libutils",
"libcutils",
@@ -18180,7 +17736,7 @@ cc_prebuilt_binary {
],
},
},
- compile_multilib: "32",
+ compile_multilib: "64",
strip: {
none: true,
},
@@ -18202,6 +17758,13 @@ install_symlink {
symlink_target: "/system_ext/lib64/libimsmedia_jni.so",
}
+install_symlink {
+ name: "system_ext_priv-app_WfdService_lib_arm64_libwfdnative_so",
+ system_ext_specific: true,
+ installed_location: "priv-app/WfdService/lib/arm64/libwfdnative.so",
+ symlink_target: "/system_ext/lib64/libwfdnative.so",
+}
+
install_symlink {
name: "vendor_bin_expat",
soc_specific: true,
diff --git a/proprietary/system/framework/WfdCommon.jar b/proprietary/system/framework/WfdCommon.jar
index f7b32d9..61a53cf 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 7dd5434..e8f7d1d 100755
Binary files a/proprietary/system_ext/bin/wfdservice and b/proprietary/system_ext/bin/wfdservice differ
diff --git a/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy b/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy
similarity index 84%
rename from proprietary/system_ext/etc/seccomp_policy/wfdservice.policy
rename to proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy
index 09d5a83..98b3c11 100644
--- a/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy
+++ b/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Qualcomm Technologies, Inc.
+# Copyright (c) 2021, 2022 Qualcomm Technologies, Inc.
# All Rights Reserved.
# Confidential and Proprietary - Qualcomm Technologies, Inc
#
@@ -18,7 +18,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
munmap: 1
futex: 1
@@ -29,19 +29,19 @@ ioctl: 1
close: 1
openat: 1
mremap: 1
-fstat64: 1
+fstat: 1
readlinkat: 1
pread64: 1
-fstatfs64: 1
+fstatfs: 1
clock_gettime: 1
-fstatat64: 1
+fstatat: 1
read: 1
write: 1
-fcntl64: 1
+fcntl: 1
ppoll: 1
faccessat: 1
rt_sigaction: 1
-getuid32: 1
+getuid: 1
madvise: 1
rt_sigprocmask: 1
writev: 1
@@ -49,8 +49,9 @@ personality: 1
getrandom: 1
gettimeofday: 1
#set_tls: 1
-statfs64: 1
+statfs: 1
ugetrlimit: 1
+getrlimit: 1
execve: 1
connect: 1
socket: arg0 == AF_UNIX
@@ -76,3 +77,10 @@ getdents64: 1
dup: 1
lseek: 1
tgkill: 1
+process_vm_readv: 1
+memfd_create: 1
+eventfd2: 1
+epoll_create1: 1
+epoll_ctl: 1
+recvfrom: 1
+epoll_pwait: 1
diff --git a/proprietary/system_ext/etc/wfdconfigsink.xml b/proprietary/system_ext/etc/wfdconfigsink.xml
index 6f5a2af..e792b1d 100644
--- a/proprietary/system_ext/etc/wfdconfigsink.xml
+++ b/proprietary/system_ext/etc/wfdconfigsink.xml
@@ -1,6 +1,6 @@
@@ -278,9 +278,20 @@
0
0
+
+
+ 0
+ 3
+ 0
+ 0
+ 0
+ 0
+
4321
+
+ 0
diff --git a/proprietary/system_ext/lib/libmmrtpdecoder.so b/proprietary/system_ext/lib/libmmrtpdecoder.so
deleted file mode 100644
index 47609b2..0000000
Binary files a/proprietary/system_ext/lib/libmmrtpdecoder.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libmmrtpencoder.so b/proprietary/system_ext/lib/libmmrtpencoder.so
deleted file mode 100644
index 8bb7563..0000000
Binary files a/proprietary/system_ext/lib/libmmrtpencoder.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdavenhancements.so b/proprietary/system_ext/lib/libwfdavenhancements.so
deleted file mode 100644
index 79bc08c..0000000
Binary files a/proprietary/system_ext/lib/libwfdavenhancements.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdclient.so b/proprietary/system_ext/lib/libwfdclient.so
deleted file mode 100644
index 245ca94..0000000
Binary files a/proprietary/system_ext/lib/libwfdclient.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdcommonutils.so b/proprietary/system_ext/lib/libwfdcommonutils.so
deleted file mode 100644
index bbe2286..0000000
Binary files a/proprietary/system_ext/lib/libwfdcommonutils.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdconfigutils.so b/proprietary/system_ext/lib/libwfdconfigutils.so
deleted file mode 100644
index 75a4ef6..0000000
Binary files a/proprietary/system_ext/lib/libwfdconfigutils.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfddisplayconfig.so b/proprietary/system_ext/lib/libwfddisplayconfig.so
deleted file mode 100644
index af0b7e0..0000000
Binary files a/proprietary/system_ext/lib/libwfddisplayconfig.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdmminterface.so b/proprietary/system_ext/lib/libwfdmminterface.so
deleted file mode 100644
index e63ab42..0000000
Binary files a/proprietary/system_ext/lib/libwfdmminterface.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdmmsink.so b/proprietary/system_ext/lib/libwfdmmsink.so
deleted file mode 100644
index da74afb..0000000
Binary files a/proprietary/system_ext/lib/libwfdmmsink.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdmmsrc_system.so b/proprietary/system_ext/lib/libwfdmmsrc_system.so
deleted file mode 100644
index 579852e..0000000
Binary files a/proprietary/system_ext/lib/libwfdmmsrc_system.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdrtsp.so b/proprietary/system_ext/lib/libwfdrtsp.so
deleted file mode 100644
index a2efe06..0000000
Binary files a/proprietary/system_ext/lib/libwfdrtsp.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdservice.so b/proprietary/system_ext/lib/libwfdservice.so
deleted file mode 100644
index 62492ee..0000000
Binary files a/proprietary/system_ext/lib/libwfdservice.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfdsinksm.so b/proprietary/system_ext/lib/libwfdsinksm.so
deleted file mode 100644
index 2642b0a..0000000
Binary files a/proprietary/system_ext/lib/libwfdsinksm.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfduibcinterface.so b/proprietary/system_ext/lib/libwfduibcinterface.so
deleted file mode 100644
index 532cf64..0000000
Binary files a/proprietary/system_ext/lib/libwfduibcinterface.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfduibcsink.so b/proprietary/system_ext/lib/libwfduibcsink.so
deleted file mode 100644
index 114f3ca..0000000
Binary files a/proprietary/system_ext/lib/libwfduibcsink.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfduibcsinkinterface.so b/proprietary/system_ext/lib/libwfduibcsinkinterface.so
deleted file mode 100644
index d47faf2..0000000
Binary files a/proprietary/system_ext/lib/libwfduibcsinkinterface.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfduibcsrc.so b/proprietary/system_ext/lib/libwfduibcsrc.so
deleted file mode 100644
index 7cbd075..0000000
Binary files a/proprietary/system_ext/lib/libwfduibcsrc.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/libwfduibcsrcinterface.so b/proprietary/system_ext/lib/libwfduibcsrcinterface.so
deleted file mode 100644
index 0b1211d..0000000
Binary files a/proprietary/system_ext/lib/libwfduibcsrcinterface.so and /dev/null 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
deleted file mode 100644
index 0a78b41..0000000
Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so b/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so
deleted file mode 100644
index 1f655aa..0000000
Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libmmrtpdecoder.so b/proprietary/system_ext/lib64/libmmrtpdecoder.so
index e04d551..43dd0d5 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 5572a32..092844b 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/libwfdavenhancements.so b/proprietary/system_ext/lib64/libwfdavenhancements.so
index 148e7b6..aaf59a0 100644
Binary files a/proprietary/system_ext/lib64/libwfdavenhancements.so and b/proprietary/system_ext/lib64/libwfdavenhancements.so differ
diff --git a/proprietary/system_ext/lib64/libwfdclient.so b/proprietary/system_ext/lib64/libwfdclient.so
index bb47437..a7020fc 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 80c3844..8eafa81 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 629012e..f6f69fa 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 fd05c54..2f40cc8 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 99f4a1d..8e3110e 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 4e783bf..4b182cd 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/libwfdmmsrc_system.so b/proprietary/system_ext/lib64/libwfdmmsrc_system.so
index 2a2d6b8..1ea216f 100644
Binary files a/proprietary/system_ext/lib64/libwfdmmsrc_system.so and b/proprietary/system_ext/lib64/libwfdmmsrc_system.so differ
diff --git a/proprietary/system_ext/lib64/libwfdnative.so b/proprietary/system_ext/lib64/libwfdnative.so
index ced827b..119867e 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 ca1a5bb..e472f56 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/libwfdservice.so b/proprietary/system_ext/lib64/libwfdservice.so
index 90629e3..127a227 100644
Binary files a/proprietary/system_ext/lib64/libwfdservice.so and b/proprietary/system_ext/lib64/libwfdservice.so differ
diff --git a/proprietary/system_ext/lib64/libwfdsinksm.so b/proprietary/system_ext/lib64/libwfdsinksm.so
index 8499ab6..f50a531 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 b581be3..4f810e7 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 a58c662..8b0b41b 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 eebe91d..91decf7 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 37582df..1989161 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 6f89231..33e3eb0 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/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so
index f5137c0..c04e005 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so and b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so
index c9855da..bc46c96 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so and b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so differ
diff --git a/proprietary/system_ext/priv-app/WfdService/WfdService.apk b/proprietary/system_ext/priv-app/WfdService/WfdService.apk
index 1d730da..5c3ce6b 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/proprietary/system_ext/priv-app/ims/ims.apk b/proprietary/system_ext/priv-app/ims/ims.apk
index 1a4aa96..d017d60 100644
Binary files a/proprietary/system_ext/priv-app/ims/ims.apk and b/proprietary/system_ext/priv-app/ims/ims.apk differ
diff --git a/sm6375-common-vendor.mk b/sm6375-common-vendor.mk
index 0e20ed7..a242e40 100644
--- a/sm6375-common-vendor.mk
+++ b/sm6375-common-vendor.mk
@@ -24,7 +24,7 @@ PRODUCT_COPY_FILES += \
vendor/motorola/sm6375-common/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml \
vendor/motorola/sm6375-common/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/vendor.qti.ims.rcsservice.xml \
vendor/motorola/sm6375-common/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/motorola/sm6375-common/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice.policy \
+ vendor/motorola/sm6375-common/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice64.policy \
vendor/motorola/sm6375-common/proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_telephony_system_packages_config.xml \
vendor/motorola/sm6375-common/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \
vendor/motorola/sm6375-common/proprietary/vendor/etc/ArmHDCP_QTI_Android.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/ArmHDCP_QTI_Android.cfg \
@@ -750,29 +750,7 @@ PRODUCT_PACKAGES += \
libsns_device_mode_skel \
libsns_low_lat_stream_skel \
com.qualcomm.qti.ant@1.0 \
- libmmosal \
- libmmparser_lite \
- libmmrtpdecoder \
- libmmrtpencoder \
- libwfdavenhancements \
- libwfdclient \
- libwfdcommonutils \
- libwfdconfigutils \
- libwfddisplayconfig \
- libwfdmminterface \
- libwfdmmsink \
- libwfdmmsrc_system \
- libwfdrtsp \
- libwfdservice \
- libwfdsinksm \
- libwfduibcinterface \
- libwfduibcsink \
- libwfduibcsinkinterface \
- libwfduibcsrc \
- libwfduibcsrcinterface \
vendor.qti.diaghal@1.0 \
- vendor.qti.hardware.wifidisplaysession@1.0 \
- vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk \
com.qualcomm.qti.dpm.api@1.0 \
lib-imsvideocodec \
lib-imsvt \
@@ -785,11 +763,33 @@ PRODUCT_PACKAGES += \
libdpmtcm \
libimscamera_jni \
libimsmedia_jni \
+ libmmosal \
+ libmmparser_lite \
+ libmmrtpdecoder \
+ libmmrtpencoder \
libqspmsvc \
+ libwfdavenhancements \
+ libwfdclient \
+ libwfdcommonutils \
+ libwfdconfigutils \
+ libwfddisplayconfig \
+ libwfdmminterface \
+ libwfdmmsink \
+ libwfdmmsrc_system \
libwfdnative \
+ libwfdrtsp \
+ libwfdservice \
+ libwfdsinksm \
+ libwfduibcinterface \
+ libwfduibcsink \
+ libwfduibcsinkinterface \
+ libwfduibcsrc \
+ libwfduibcsrcinterface \
vendor.qti.ImsRtpService-V1-ndk \
vendor.qti.diaghal-V1-ndk \
vendor.qti.hardware.dpmservice@1.0 \
+ vendor.qti.hardware.wifidisplaysession@1.0 \
+ vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk \
vendor.qti.imsrtpservice@3.0 \
vendor.qti.imsrtpservice@3.1 \
vendor.qti.qspmhal-V1-ndk \
@@ -914,6 +914,7 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so \
system_ext_priv-app_ims_lib_arm64_libimsmedia_jni_so \
+ system_ext_priv-app_WfdService_lib_arm64_libwfdnative_so \
vendor_bin_expat \
vendor_lib_libEGL_adreno_so \
vendor_lib_libGLESv2_adreno_so \