diff --git a/Android.bp b/Android.bp index d9a01db..fc641df 100644 --- a/Android.bp +++ b/Android.bp @@ -3,6 +3,8 @@ // This file is generated by device/motorola/sm7325-common/setup-makefiles.sh soong_namespace { + imports: [ + ], } cc_prebuilt_library_shared { @@ -225,13 +227,6 @@ dex_import { product_specific: true, } -dex_import { - name: "moto-telephony", - owner: "motorola", - jars: ["proprietary/system_ext/framework/moto-telephony.jar"], - system_ext_specific: true, -} - dex_import { name: "com.qti.dpmframework", owner: "motorola", @@ -246,6 +241,13 @@ dex_import { system_ext_specific: true, } +dex_import { + name: "moto-telephony", + owner: "motorola", + jars: ["proprietary/system_ext/framework/moto-telephony.jar"], + system_ext_specific: true, +} + dex_import { name: "qcrilhook", 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 902f419..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 63f02aa..0000000 --- a/proprietary/system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc +++ /dev/null @@ -1,37 +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 vendor_qtr - chmod 2770 /dev/socket/qcc_app - - mkdir /data/misc/qcc 0770 system vendor_qtr - mkdir /data/misc/qcc/up 0770 system vendor_qtr - mkdir /data/misc/qcc/down 0770 system vendor_qtr - mkdir /data/misc/qcc/conf 0770 system vendor_qtr - mkdir /data/misc/qcc/shared 0770 system vendor_qtr - mkdir /data/misc/qcc/down/200 0770 system vendor_qtr - -on property:vendor.qti.qcc.oper.mode=1 - write /data/misc/qcc/conf/qcc.conf "OperationMode:1" - chown system vendor_qtr /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 vendor_qtr /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 vendor_qtr /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 vendor_qtr /data/misc/qcc/conf/qcc.conf - -service qccsyshal@1.2-service /system/system_ext/bin/qccsyshal@1.2-service - class hal - user system - group vendor_qtr system diff --git a/proprietary/system_ext/lib/libqcc_file_agent_sys.so b/proprietary/system_ext/lib/libqcc_file_agent_sys.so deleted file mode 100644 index b9d7922..0000000 Binary files a/proprietary/system_ext/lib/libqcc_file_agent_sys.so and /dev/null differ diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0.so b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0.so deleted file mode 100644 index 08e6311..0000000 Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0.so and /dev/null differ diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1.so b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1.so deleted file mode 100644 index efebb90..0000000 Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1.so and /dev/null differ diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2-halimpl.so b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2-halimpl.so deleted file mode 100644 index 27057ba..0000000 Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2-halimpl.so and /dev/null differ diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2.so b/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2.so deleted file mode 100644 index f504609..0000000 Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2.so and /dev/null differ 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 ad370f6..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 6b03043..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 a513a91..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 7021d3b..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 d0deb82..0000000 Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so and /dev/null differ diff --git a/sm7325-common-vendor.mk b/sm7325-common-vendor.mk index 6b72520..a8514b3 100644 --- a/sm7325-common-vendor.mk +++ b/sm7325-common-vendor.mk @@ -13,13 +13,11 @@ PRODUCT_COPY_FILES += \ vendor/motorola/sm7325-common/proprietary/system/etc/permissions/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \ vendor/motorola/sm7325-common/proprietary/system/etc/sysconfig/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \ vendor/motorola/sm7325-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \ - vendor/motorola/sm7325-common/proprietary/system_ext/bin/qccsyshal@1.2-service:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/qccsyshal@1.2-service \ vendor/motorola/sm7325-common/proprietary/system_ext/bin/qspmsvc:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/qspmsvc \ vendor/motorola/sm7325-common/proprietary/system_ext/bin/wfdservice:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/wfdservice \ 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 \ @@ -35,7 +33,6 @@ PRODUCT_COPY_FILES += \ vendor/motorola/sm7325-common/proprietary/system_ext/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmparser_lite.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmrtpdecoder.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmrtpencoder.so \ - vendor/motorola/sm7325-common/proprietary/system_ext/lib/libqcc_file_agent_sys.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libqcc_file_agent_sys.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib/libwfdavenhancements.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdavenhancements.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdclient.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdcommonutils.so \ @@ -53,10 +50,6 @@ PRODUCT_COPY_FILES += \ vendor/motorola/sm7325-common/proprietary/system_ext/lib/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsrc.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsrcinterface.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.diaghal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.diaghal@1.0.so \ - vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.qccsyshal@1.0.so \ - vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.qccsyshal@1.1.so \ - vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2-halimpl.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.qccsyshal@1.2-halimpl.so \ - vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.hardware.qccsyshal@1.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.qccsyshal@1.2.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.wifidisplaysession@1.0.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.ant@1.0.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \ @@ -75,7 +68,6 @@ PRODUCT_COPY_FILES += \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmparser_lite.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpdecoder.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpencoder.so \ - vendor/motorola/sm7325-common/proprietary/system_ext/lib64/libqcc_file_agent_sys.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libqcc_file_agent_sys.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/libqspmsvc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libqspmsvc.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdclient.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdcommonutils.so \ @@ -93,10 +85,6 @@ PRODUCT_COPY_FILES += \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsrcinterface.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.diaghal@1.0.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.dpmservice@1.0.so \ - vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.qccsyshal@1.0.so \ - vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.qccsyshal@1.1.so \ - vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so \ - vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.qccsyshal@1.2.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.0.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.1.so \ vendor/motorola/sm7325-common/proprietary/system_ext/lib64/vendor.qti.qspmhal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.qspmhal@1.0.so \ @@ -1100,9 +1088,9 @@ PRODUCT_PACKAGES += \ uimgbalibrary \ uimgbamanagerlibrary \ uimservicelibrary \ - moto-telephony \ com.qti.dpmframework \ dpmapi \ + moto-telephony \ qcrilhook \ vendor.qti.hardware.alarm-V1.0-java \ vendor.qti.ims.configservice-V1.0-java \