diff --git a/Android.bp b/Android.bp index 9a9e5f3..336526c 100644 --- a/Android.bp +++ b/Android.bp @@ -8018,31 +8018,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcneqmiutils", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcneqmiutils.so", - ], - shared_libs: [ - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcpion", owner: "motorola", @@ -8398,37 +8373,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libgdtap", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libgdtap.so", - ], - shared_libs: [ - "libutils", - "libcutils", - "libgps.utils", - "liblog", - "libloc_core", - "libizat_core", - "liblbs_core", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libgplaf", owner: "motorola", @@ -8880,7 +8824,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "libloc_socket", + name: "libloc_api_wds", owner: "motorola", strip: { none: true, @@ -8888,13 +8832,17 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: [ - "proprietary/vendor/lib64/libloc_socket.so", + "proprietary/vendor/lib64/libloc_api_wds.so", ], shared_libs: [ - "libutils", + "libgps.utils", + "libidl", "libcutils", "liblog", - "libgps.utils", + "libutils", + "liblocation_api", + "libqmi_cci", + "libqmi_common_so", "libc++", "libc", "libm", @@ -9027,35 +8975,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "liblowi_wifihal", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/liblowi_wifihal.so", - ], - shared_libs: [ - "liblowi_client", - "libcutils", - "libutils", - "liblog", - "libgps.utils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "liblqe", owner: "motorola", @@ -9655,7 +9574,7 @@ cc_prebuilt_library_shared { "libbase", "libfmq", "libhidlbase", - "vendor.qti.hardware.qccsyshal@1.0_vendor", + "vendor.qti.hardware.qccsyshal@1.0", "libc++", "libc", "libm", @@ -10729,37 +10648,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libslimclient", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libslimclient.so", - ], - shared_libs: [ - "libutils", - "libgps.utils", - "liblog", - "libqmi_cci", - "libqmi_common_so", - "libqmi_encdec", - "libdiag", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libsnapdragoncolor-manager", owner: "motorola", @@ -12886,8 +12774,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.hardware.qccsyshal@1.0_vendor", - stem: "vendor.qti.hardware.qccsyshal@1.0", + name: "vendor.qti.hardware.qccsyshal@1.0", owner: "motorola", strip: { none: true, @@ -12914,35 +12801,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.qccvndhal@1.0_vendor", - stem: "vendor.qti.hardware.qccvndhal@1.0", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@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.qseecom@1.0", owner: "motorola", @@ -16889,32 +16747,6 @@ cc_prebuilt_library_shared { system_ext_specific: true, } -cc_prebuilt_library_shared { - name: "libqcc_file_agent_sys", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/libqcc_file_agent_sys.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - cc_prebuilt_library_shared { name: "libqspmsvc", owner: "motorola", @@ -17039,156 +16871,6 @@ cc_prebuilt_library_shared { system_ext_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.qccsyshal@1.0", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@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.qccsyshal@1.1", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1.so", - ], - shared_libs: [ - "vendor.qti.hardware.qccsyshal@1.0", - "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.qccsyshal@1.2-halimpl", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so", - ], - shared_libs: [ - "libprotobuf-cpp-full", - "libcutils", - "liblog", - "libhidlbase", - "libutils", - "libfmq", - "libqcc_file_agent_sys", - "vendor.qti.hardware.qccsyshal@1.2", - "vendor.qti.hardware.qccsyshal@1.1", - "vendor.qti.hardware.qccsyshal@1.0", - "libz", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.qccsyshal@1.2", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so", - ], - shared_libs: [ - "vendor.qti.hardware.qccsyshal@1.0", - "vendor.qti.hardware.qccsyshal@1.1", - "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.qccvndhal@1.0", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/vendor.qti.hardware.qccvndhal@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.imsrtpservice@3.0", owner: "motorola", @@ -17246,33 +16928,6 @@ cc_prebuilt_library_shared { system_ext_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.qccvndhal_aidl-V1-ndk", - owner: "motorola", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/lib64/vendor.qti.qccvndhal_aidl-V1-ndk.so", - ], - shared_libs: [ - "libbinder_ndk", - "android.hardware.common-V2-ndk", - "android.hardware.common.fmq-V1-ndk", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - system_ext_specific: true, -} - cc_prebuilt_library_shared { name: "vendor.qti.qspmhal-V1-ndk", owner: "motorola", @@ -20070,40 +19725,6 @@ cc_prebuilt_binary { system_ext_specific: true, } -cc_prebuilt_binary { - name: "qccsyshal@1.2-service", - owner: "motorola", - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/bin/qccsyshal@1.2-service", - ], - shared_libs: [ - "libbase", - "libhidlbase", - "libutils", - "libfmq", - "libbinder", - "liblog", - "vendor.qti.hardware.qccsyshal@1.2-halimpl", - "vendor.qti.hardware.qccsyshal@1.2", - "vendor.qti.hardware.qccsyshal@1.1", - "vendor.qti.hardware.qccsyshal@1.0", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - system_ext_specific: true, -} - cc_prebuilt_binary { name: "qspmsvc", owner: "motorola", diff --git a/proprietary/system_ext/bin/qccsyshal@1.2-service b/proprietary/system_ext/bin/qccsyshal@1.2-service deleted file mode 100755 index 207451d..0000000 Binary files a/proprietary/system_ext/bin/qccsyshal@1.2-service and /dev/null differ diff --git a/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc b/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc deleted file mode 100644 index c477084..0000000 --- a/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (c) 2021-2022 Qualcomm Technologies, Inc. -# All Rights Reserved. -# Confidential and Proprietary - Qualcomm Technologies, Inc. -# - -on post-fs-data - mkdir /dev/socket/qcc_app 0770 system misc - chmod 2770 /dev/socket/qcc_app - - mkdir /data/misc/qcc 0770 system misc - mkdir /data/misc/qcc/up 0770 system misc - mkdir /data/misc/qcc/down 0770 system misc - mkdir /data/misc/qcc/down/200 0770 system misc - mkdir /data/misc/qcc/conf 0770 system misc - mkdir /data/misc/qcc/shared 0770 system misc - mkdir /data/misc/qcc/file_agent 0770 system misc - chown system misc /data/misc/qcc/file_agent - -on property:vendor.qti.qcc.oper.mode=1 - write /data/misc/qcc/conf/qcc.conf "OperationMode:1" - chown system misc /data/misc/qcc/conf/qcc.conf - chmod 0660 /data/misc/qcc/conf/qcc.conf - -on property:vendor.qti.qcc.oper.mode=2 - write /data/misc/qcc/conf/qcc.conf "OperationMode:2" - chown system misc /data/misc/qcc/conf/qcc.conf - chmod 0660 /data/misc/qcc/conf/qcc.conf - -on property:vendor.qti.qcc.oper.mode=3 - write /data/misc/qcc/conf/qcc.conf "OperationMode:3" - chown system misc /data/misc/qcc/conf/qcc.conf - chmod 0660 /data/misc/qcc/conf/qcc.conf - -on property:vendor.qti.qcc.oper.mode=4 - write /data/misc/qcc/conf/qcc.conf "OperationMode:4" - chown system misc /data/misc/qcc/conf/qcc.conf - chmod 0660 /data/misc/qcc/conf/qcc.conf - -on property:vendor.qti.qcc.oper.mode=6 - write /data/misc/qcc/conf/qcc.conf "OperationMode:6" - chown system misc /data/misc/qcc/conf/qcc.conf - chmod 0660 /data/misc/qcc/conf/qcc.conf - -service qccsyshal@1.2-service /system/system_ext/bin/qccsyshal@1.2-service - class hal - user system - group misc system diff --git a/proprietary/system_ext/lib64/libqcc_file_agent_sys.so b/proprietary/system_ext/lib64/libqcc_file_agent_sys.so deleted file mode 100644 index fe728d3..0000000 Binary files a/proprietary/system_ext/lib64/libqcc_file_agent_sys.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0.so deleted file mode 100644 index 650abb0..0000000 Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1.so b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1.so deleted file mode 100644 index 5c71ce7..0000000 Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so deleted file mode 100644 index 8a99dc9..0000000 Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so b/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so deleted file mode 100644 index c51355b..0000000 Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.qccvndhal@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.qccvndhal@1.0.so deleted file mode 100644 index d7919f2..0000000 Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.qccvndhal@1.0.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/vendor.qti.qccvndhal_aidl-V1-ndk.so b/proprietary/system_ext/lib64/vendor.qti.qccvndhal_aidl-V1-ndk.so deleted file mode 100644 index adac49e..0000000 Binary files a/proprietary/system_ext/lib64/vendor.qti.qccvndhal_aidl-V1-ndk.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libcneqmiutils.so b/proprietary/vendor/lib64/libcneqmiutils.so deleted file mode 100644 index 8b5d486..0000000 Binary files a/proprietary/vendor/lib64/libcneqmiutils.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libgdtap.so b/proprietary/vendor/lib64/libgdtap.so deleted file mode 100644 index e5461b1..0000000 Binary files a/proprietary/vendor/lib64/libgdtap.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libloc_api_wds.so b/proprietary/vendor/lib64/libloc_api_wds.so new file mode 100644 index 0000000..2c7d058 Binary files /dev/null and b/proprietary/vendor/lib64/libloc_api_wds.so differ diff --git a/proprietary/vendor/lib64/libloc_socket.so b/proprietary/vendor/lib64/libloc_socket.so deleted file mode 100644 index b37cc76..0000000 Binary files a/proprietary/vendor/lib64/libloc_socket.so and /dev/null differ diff --git a/proprietary/vendor/lib64/liblowi_wifihal.so b/proprietary/vendor/lib64/liblowi_wifihal.so deleted file mode 100644 index a205936..0000000 Binary files a/proprietary/vendor/lib64/liblowi_wifihal.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libslimclient.so b/proprietary/vendor/lib64/libslimclient.so deleted file mode 100644 index d356a95..0000000 Binary files a/proprietary/vendor/lib64/libslimclient.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so deleted file mode 100644 index e1fa568..0000000 Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so and /dev/null differ diff --git a/sm7325-common-vendor.mk b/sm7325-common-vendor.mk index 2a0089e..5888aa2 100644 --- a/sm7325-common-vendor.mk +++ b/sm7325-common-vendor.mk @@ -14,7 +14,6 @@ PRODUCT_COPY_FILES += \ vendor/motorola/sm7325-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \ vendor/motorola/sm7325-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \ vendor/motorola/sm7325-common/proprietary/system_ext/etc/init/qspmsvc.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/qspmsvc.rc \ - vendor/motorola/sm7325-common/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc \ vendor/motorola/sm7325-common/proprietary/system_ext/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/wfdservice.rc \ vendor/motorola/sm7325-common/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \ vendor/motorola/sm7325-common/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \ @@ -530,7 +529,6 @@ PRODUCT_PACKAGES += \ libcne \ libcneapiclient \ libcneoplookup \ - libcneqmiutils \ libcpion \ libcvp_util \ libcvpcpuRev_skel \ @@ -543,7 +541,6 @@ PRODUCT_PACKAGES += \ libdrmfs \ libdrmtime \ libgameoptfeature \ - libgdtap \ libgplaf \ libhdr_tm \ libhdrdynamic \ @@ -559,12 +556,11 @@ PRODUCT_PACKAGES += \ liblmutils-ns \ libloadalgo_stub \ libloc_api_v02 \ - libloc_socket \ + libloc_api_wds \ liblocationservice \ liblocationservice_glue \ liblog_vendor \ liblowi_client \ - liblowi_wifihal \ liblqe \ libmdmcutback \ libmemperfd \ @@ -620,7 +616,6 @@ PRODUCT_PACKAGES += \ libsensorslog \ libsi \ libskewknob \ - libslimclient \ libsnapdragoncolor-manager \ libsnapdragoncolor-qdcm \ libsns_device_mode_stub \ @@ -691,8 +686,7 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.iop@1.0 \ vendor.qti.hardware.iop@2.0 \ vendor.qti.hardware.mwqemadapter@1.0 \ - vendor.qti.hardware.qccsyshal@1.0_vendor \ - vendor.qti.hardware.qccvndhal@1.0_vendor \ + vendor.qti.hardware.qccsyshal@1.0 \ vendor.qti.hardware.qseecom@1.0 \ vendor.qti.hardware.qteeconnector@1.0 \ vendor.qti.hardware.radio.am@1.0 \ @@ -832,19 +826,12 @@ PRODUCT_PACKAGES += \ libdpmtcm \ libimscamera_jni \ libimsmedia_jni \ - libqcc_file_agent_sys \ libqspmsvc \ libwfdnative \ vendor.qti.ImsRtpService-V1-ndk \ vendor.qti.hardware.dpmservice@1.0 \ - vendor.qti.hardware.qccsyshal@1.0 \ - vendor.qti.hardware.qccsyshal@1.1 \ - vendor.qti.hardware.qccsyshal@1.2-halimpl \ - vendor.qti.hardware.qccsyshal@1.2 \ - vendor.qti.hardware.qccvndhal@1.0 \ vendor.qti.imsrtpservice@3.0 \ vendor.qti.imsrtpservice@3.1 \ - vendor.qti.qccvndhal_aidl-V1-ndk \ vendor.qti.qspmhal-V1-ndk \ vendor.qti.qspmhal@1.0 \ CACertService \ @@ -965,7 +952,6 @@ PRODUCT_PACKAGES += \ wifidisplayhalservice \ xtra-daemon \ dpmd \ - qccsyshal@1.2-service \ qspmsvc \ wfdservice