From 7f1f072b15d19633f7fafc21f95786ab0fd7b58d Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Wed, 25 Nov 2020 10:30:20 +0000 Subject: msm8996-common: Move telephony packages to /system_ext Change-Id: I38329f6d4ebb7b1a0b0f01e40918fdb73ccbcba9 --- Android.mk | 4 +- extract-files.sh | 18 ++++- msm8996.mk | 5 +- permissions/product-privapp-permissions-qti.xml | 44 ------------- permissions/system_ext-privapp-permissions-qti.xml | 48 ++++++++++++++ proprietary-files.txt | 77 +++++++++++----------- 6 files changed, 108 insertions(+), 88 deletions(-) delete mode 100644 permissions/product-privapp-permissions-qti.xml create mode 100644 permissions/system_ext-privapp-permissions-qti.xml diff --git a/Android.mk b/Android.mk index 4eb8b97..91a2620 100644 --- a/Android.mk +++ b/Android.mk @@ -56,12 +56,12 @@ $(DSP_MOUNT_POINT): ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT) IMS_LIBS := libimscamera_jni.so libimsmedia_jni.so -IMS_SYMLINKS := $(addprefix $(TARGET_OUT_PRODUCT_APPS_PRIVILEGED)/ims/lib/arm64/,$(notdir $(IMS_LIBS))) +IMS_SYMLINKS := $(addprefix $(TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED)/ims/lib/arm64/,$(notdir $(IMS_LIBS))) $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "IMS lib link: $@" @mkdir -p $(dir $@) @rm -rf $@ - $(hide) ln -sf /product/lib64/$(notdir $@) $@ + $(hide) ln -sf /system_ext/lib64/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS) diff --git a/extract-files.sh b/extract-files.sh index d4c5392..ce86ad9 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -60,7 +60,7 @@ fi function blob_fixup() { case "${1}" in - product/lib64/libdpmframework.so) + system_ext/lib64/libdpmframework.so) sed -i "s/libhidltransport.so/libcutils-v29.so\x00\x00\x00/" "${2}" ;; @@ -114,6 +114,22 @@ function blob_fixup() { sed -i 's|"android.hidl.manager-V1.0-java"|"android.hidl.manager@1.0-java"|' ${2} ;; + system_ext/etc/init/dpmd.rc) + sed -i "s/\/system\/product\/bin\//\/system\/system_ext\/bin\//g" "${2}" + ;; + + system_ext/etc/permissions/com.qti.dpmframework.xml | system_ext/etc/permissions/dpmapi.xml) + sed -i "s/\/system\/product\/framework\//\/system\/system_ext\/framework\//g" "${2}" + ;; + + system_ext/etc/permissions/qcrilhook.xml | system_ext/etc/permissions/telephonyservice.xml) + sed -i "s/\/system\/framework\//\/system\/system_ext\/framework\//g" "${2}" + ;; + + system_ext/etc/permissions/qti_libpermissions.xml) + sed -i "s/name=\"android.hidl.manager-V1.0-java/name=\"android.hidl.manager@1.0-java/g" "${2}" + ;; + # Rename vulkan.msm8953 vendor/lib/hw/vulkan.msm8996.so | vendor/lib64/hw/vulkan.msm8996.so) patchelf --set-soname "vulkan.msm8996.so" "${2}" diff --git a/msm8996.mk b/msm8996.mk index 7a7e0a1..502b6df 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -343,7 +343,7 @@ PRODUCT_COPY_FILES += \ # QCOM PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \ - $(LOCAL_PATH)/permissions/product-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-qti.xml \ + $(LOCAL_PATH)/permissions/system_ext-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-qti.xml \ $(LOCAL_PATH)/permissions/system-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml # QMI @@ -424,8 +424,7 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprotobuf-cpp-lite-v28.so \ prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprotobuf-cpp-full-v28.so \ - prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libcutils-v29.so \ - prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcutils-v29.so + prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libcutils-v29.so # Vibrator PRODUCT_PACKAGES += \ diff --git a/permissions/product-privapp-permissions-qti.xml b/permissions/product-privapp-permissions-qti.xml deleted file mode 100644 index 108905c..0000000 --- a/permissions/product-privapp-permissions-qti.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - diff --git a/permissions/system_ext-privapp-permissions-qti.xml b/permissions/system_ext-privapp-permissions-qti.xml new file mode 100644 index 0000000..82888f6 --- /dev/null +++ b/permissions/system_ext-privapp-permissions-qti.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + diff --git a/proprietary-files.txt b/proprietary-files.txt index cee778f..2f80ab9 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -244,11 +244,11 @@ vendor/lib/libchromatix_ov8865_zsl_video.so etc/cne/Nexus/ATT/ATT_profiles.xml|33e568627fd3f94dc45bca1c01ad10e6d8fb5b52 etc/cne/Nexus/ROW/ROW_profiles.xml|238e785e9674b27c4b2365958d127533d7293132 etc/cne/Nexus/VZW/VZW_profiles.xml|0f63b632e3a3f114def7aeadaabd13851c8ceec5 -product/lib64/com.quicinc.cne.api@1.0.so|06764410022518f75a8e7fa1de35b7577cdbe8f9 -product/lib64/com.quicinc.cne.api@1.1.so|8940ad6defe4ffba387a259a698c2def51f1d5fa -product/lib64/com.quicinc.cne.constants@1.0.so|e2f9123a013c2c116b02a1e057870f885808f654 -product/lib64/com.quicinc.cne.constants@2.0.so|b58e07086d9992d0911391ad185f277e1cfd4fe5 -product/lib64/com.quicinc.cne.constants@2.1.so|92fc6a953b061fea1895e58fa298ce8de8a6d03c +product/lib64/com.quicinc.cne.api@1.0.so:system_ext/lib64/com.quicinc.cne.api@1.0.so|06764410022518f75a8e7fa1de35b7577cdbe8f9 +product/lib64/com.quicinc.cne.api@1.1.so:system_ext/lib64/com.quicinc.cne.api@1.1.so|8940ad6defe4ffba387a259a698c2def51f1d5fa +product/lib64/com.quicinc.cne.constants@1.0.so:system_ext/lib64/com.quicinc.cne.constants@1.0.so|e2f9123a013c2c116b02a1e057870f885808f654 +product/lib64/com.quicinc.cne.constants@2.0.so:system_ext/lib64/com.quicinc.cne.constants@2.0.so|b58e07086d9992d0911391ad185f277e1cfd4fe5 +product/lib64/com.quicinc.cne.constants@2.1.so:system_ext/lib64/com.quicinc.cne.constants@2.1.so|92fc6a953b061fea1895e58fa298ce8de8a6d03c -vendor/app/CneApp/CneApp.apk|2356a0335ab8e0106832a9325f972467654fd1f0 -vendor/app/IWlanService/IWlanService.apk|12da3d82b6cc062d2af29a0b5f43fc8acf9adbb2 vendor/bin/cnd|edba24c950546f80478916bb1ffe02ed58f4c96d @@ -299,23 +299,24 @@ vendor/lib64/vendor.qti.hardware.data.latency@1.0.so|53794a8d4dfeb0fbd233a4b1287 vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so|35ad6e08d00e8b1695964fa7d6ddbc521eda8628 vendor/lib64/vendor.qti.latency@2.0.so|0144eec541989f450695ec8cbdd595df4009fe1a + # Fingerprint lib64/hw/fingerprint.qcom.so:vendor/lib64/hw/fingerprint.qcom.so # DPM - from daisy - QKQ1.191002.002 V11.0.2.0.QDLMIXM -product/bin/dpmd|cac8f3eadeeec202f56d5b5f7a8c75e82e376d9f -product/etc/dpm/dpm.conf|95e27da8c989e96c6faea6f0697bce11955b62a5 -product/etc/init/dpmd.rc|7f95195a89fddce06b93006a737701270e91f669 -product/etc/permissions/com.qti.dpmframework.xml|4613f8b8629d0b823e6aaab45d399ac30da06c09 -product/etc/permissions/dpmapi.xml|0991b3069308620cfcad53873e9f09af181b981d -product/framework/com.qti.dpmframework.jar|e39a7e06af2d1e95a3724c19c36b8716277f53a1 -product/framework/dpmapi.jar|4696df9793ad676b305d53b5d7ce65ecf74771ad -product/lib64/com.qualcomm.qti.dpm.api@1.0.so|a70cfc1be3e06cde6318d6969e114429fe1950bb -product/lib64/libdpmctmgr.so|7ee0d1d40a8fc7fea924602db13717235ed2c2aa -product/lib64/libdpmfdmgr.so|cb0157da0ffe6827471662a5b7881e85165cb5aa -product/lib64/libdpmframework.so|8b2183e4b50a033b10c640cbc0b14a39ed5dca16|c335716a1b71f538beb8b51719c1b099ae686328 -product/lib64/libdpmtcm.so|a98ab3c419ebe49c6f3351ef4fa64ebda65d0e7d --product/priv-app/dpmserviceapp/dpmserviceapp.apk|9fd873c5330c03c62dfdeb6540b5984588295319 +product/bin/dpmd:system_ext/bin/dpmd|cac8f3eadeeec202f56d5b5f7a8c75e82e376d9f +product/etc/dpm/dpm.conf:system_ext/etc/dpm/dpm.conf|95e27da8c989e96c6faea6f0697bce11955b62a5 +product/etc/init/dpmd.rc:system_ext/etc/init/dpmd.rc|7f95195a89fddce06b93006a737701270e91f669|f061bb76ae844f6df04c1d78caf00cf29a41b112 +product/etc/permissions/com.qti.dpmframework.xml:system_ext/etc/permissions/com.qti.dpmframework.xml|4613f8b8629d0b823e6aaab45d399ac30da06c09|ab94e634782b7a2e833ce129eda74cb9333ed3f7 +product/etc/permissions/dpmapi.xml:system_ext/etc/permissions/dpmapi.xml|0991b3069308620cfcad53873e9f09af181b981d|697c88d7ebef6232ef214b17b4023bbb3ff4e625 +product/framework/com.qti.dpmframework.jar:system_ext/framework/com.qti.dpmframework.jar|e39a7e06af2d1e95a3724c19c36b8716277f53a1 +product/framework/dpmapi.jar:system_ext/framework/dpmapi.jar|4696df9793ad676b305d53b5d7ce65ecf74771ad +product/lib64/com.qualcomm.qti.dpm.api@1.0.so:system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so|a70cfc1be3e06cde6318d6969e114429fe1950bb +product/lib64/libdpmctmgr.so:system_ext/lib64/libdpmctmgr.so|7ee0d1d40a8fc7fea924602db13717235ed2c2aa +product/lib64/libdpmfdmgr.so:system_ext/lib64/libdpmfdmgr.so|cb0157da0ffe6827471662a5b7881e85165cb5aa +product/lib64/libdpmframework.so:system_ext/lib64/libdpmframework.so|8b2183e4b50a033b10c640cbc0b14a39ed5dca16|c335716a1b71f538beb8b51719c1b099ae686328 +product/lib64/libdpmtcm.so:system_ext/lib64/libdpmtcm.so|a98ab3c419ebe49c6f3351ef4fa64ebda65d0e7d +-product/priv-app/dpmserviceapp/dpmserviceapp.apk:system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk|9fd873c5330c03c62dfdeb6540b5984588295319 vendor/bin/dpmQmiMgr|a43829d478ebc243b5f7307b44aa501a7a3c8211 vendor/etc/init/dpmQmiMgr.rc|67569302d3a8828a9118c835e5b69c51b0c8ac68 vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so|a70cfc1be3e06cde6318d6969e114429fe1950bb @@ -455,16 +456,16 @@ vendor/firmware/a530v3_gpmu.fw2 vendor/firmware/a530v3_seq.fw2 # IMS --app/uceShimService/uceShimService.apk -lib64/com.qualcomm.qti.imscmservice@1.0.so -lib64/lib-imscamera.so -lib64/lib-imsvideocodec.so -lib64/lib-imsvt.so -lib64/lib-imsvtextutils.so -lib64/lib-imsvtutils.so -lib64/libdiag_system.so -lib64/librcc.so -lib64/vendor.qti.imsrtpservice@1.0.so +-app/uceShimService/uceShimService.apk:system_ext/app/uceShimService/uceShimService.apk +lib64/com.qualcomm.qti.imscmservice@1.0.so:system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so +lib64/lib-imscamera.so:system_ext/lib64/lib-imscamera.so +lib64/lib-imsvideocodec.so:system_ext/lib64/lib-imsvideocodec.so +lib64/lib-imsvt.so:system_ext/lib64/lib-imsvt.so +lib64/lib-imsvtextutils.so:system_ext/lib64/lib-imsvtextutils.so +lib64/lib-imsvtutils.so:system_ext/lib64/lib-imsvtutils.so +lib64/libdiag_system.so:system_ext/lib64/libdiag_system.so +lib64/librcc.so:system_ext/lib64/librcc.so +lib64/vendor.qti.imsrtpservice@1.0.so:system_ext/lib64/vendor.qti.imsrtpservice@1.0.so vendor/bin/ims_rtp_daemon vendor/bin/imsdatadaemon vendor/bin/imsqmidaemon @@ -485,9 +486,9 @@ vendor/lib64/vendor.qti.imsrtpservice@1.0-service-Impl.so vendor/lib64/vendor.qti.imsrtpservice@1.0_vendor.so # IMS - from daisy - QKQ1.191002.002 V11.0.2.0.QDLMIXM -product/lib64/libimscamera_jni.so|7cb89110cca94d37d68c705f12a7a5a4ee106139 -product/lib64/libimsmedia_jni.so|3540752cc3658261ea3c909f03018eea4398f84e --product/priv-app/ims/ims.apk|9c4ca91e0ec7a567d22251d7ca0640abf13fdd7b +product/lib64/libimscamera_jni.so:system_ext/lib64/libimscamera_jni.so|7cb89110cca94d37d68c705f12a7a5a4ee106139 +product/lib64/libimsmedia_jni.so:system_ext/lib64/libimsmedia_jni.so|3540752cc3658261ea3c909f03018eea4398f84e +-product/priv-app/ims/ims.apk:system_ext/priv-app/ims/ims.apk|9c4ca91e0ec7a567d22251d7ca0640abf13fdd7b vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so|ba5ffc588422c1b0f3ac8135314db2c88d62671e # Keystore @@ -618,11 +619,11 @@ vendor/lib64/libqmi_cci.so|411a074dc765fb263bec50531ce5c408dd72388f etc/permissions/qti_libpermissions.xml:vendor/etc/permissions/qti_libpermissions.xml|593bcb72cce68ceb0a70f50bcae7d460114e7c62|ef3c88495f2f61a2d16e1445113a9d80f8db0e0a # RIL --app/QtiTelephonyService/QtiTelephonyService.apk -etc/permissions/qcrilhook.xml -etc/permissions/telephonyservice.xml -framework/qcrilhook.jar --priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk|956a4017d0ba7f68e6d225e57b40d3b2bcbb4837 +-app/QtiTelephonyService/QtiTelephonyService.apk:system_ext/app/QtiTelephonyService/QtiTelephonyService.apk +etc/permissions/qcrilhook.xml:system_ext/etc/permissions/qcrilhook.xml +etc/permissions/telephonyservice.xml:system_ext/etc/permissions/telephonyservice.xml +framework/qcrilhook.jar:system_ext/framework/qcrilhook.jar +-priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk:system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk vendor/bin/ATFWD-daemon vendor/bin/netmgrd vendor/bin/qti @@ -653,8 +654,8 @@ vendor/lib/libmdmdetect.so vendor/radio/qcril_database/qcril.db # RIL - from daisy - 9/PKQ1.180917.001/V10.0.7.0.PDLMIXM -framework/QtiTelephonyServicelibrary.jar|1df2f89ffb3aedc36e1c2ca7cafbf73a6a06b3fb -framework/qti-telephony-common.jar|b1953a3599255f08f1785c677d22810f65e0167b +framework/QtiTelephonyServicelibrary.jar:system_ext/framework/QtiTelephonyServicelibrary.jar|1df2f89ffb3aedc36e1c2ca7cafbf73a6a06b3fb +framework/qti-telephony-common.jar:system_ext/framework/qti-telephony-common.jar|b1953a3599255f08f1785c677d22810f65e0167b vendor/bin/rmt_storage|346ef281e829109ba11af912509309e520351ef9 vendor/bin/tftp_server|05a9c0e0e691e534e703bded4a99083d25a26ebb vendor/lib64/libqrtr.so|83676274fde1056a0507b4100a3a5423f5af5021 -- cgit v1.2.3