diff options
| -rw-r--r-- | Android.mk | 6 | ||||
| -rwxr-xr-x | msm8996.mk | 5 | ||||
| -rw-r--r-- | permissions/product-privapp-permissions-qti.xml | 44 | ||||
| -rw-r--r-- | permissions/system-privapp-permissions-qti.xml (renamed from configs/privapp-permissions-qti.xml) | 6 | ||||
| -rw-r--r-- | proprietary-files.txt | 6 |
5 files changed, 53 insertions, 14 deletions
@@ -1,6 +1,6 @@ # # Copyright (C) 2016 The CyanogenMod Project -# Copyright (C) 2017-2018 The LineageOS Project +# 2017-2018,2020 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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_APPS_PRIVILEGED)/ims/lib/arm64/,$(notdir $(IMS_LIBS))) +IMS_SYMLINKS := $(addprefix $(TARGET_OUT_PRODUCT_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 /system/lib64/$(notdir $@) $@ + $(hide) ln -sf /product/lib64/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS) @@ -342,8 +342,9 @@ PRODUCT_COPY_FILES += \ # QCOM PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/privapp-permissions-qti.xml:system/etc/permissions/privapp-permissions-qti.xml \ - $(LOCAL_PATH)/configs/qti_whitelist.xml:system/etc/sysconfig/qti_whitelist.xml + $(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-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml # QMI PRODUCT_PACKAGES += \ diff --git a/permissions/product-privapp-permissions-qti.xml b/permissions/product-privapp-permissions-qti.xml new file mode 100644 index 0000000..108905c --- /dev/null +++ b/permissions/product-privapp-permissions-qti.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright (c) 2017, The Linux Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +--> + +<!-- +This XML file declares which signature|privileged permissions should be +granted to privileged applications on Qualcomm devices. +It allows additional grants on top of privapp-permissions-platform.xml +--> + +<permissions> + <privapp-permissions package="org.codeaurora.ims"> + <permission name="android.permission.READ_PRECISE_PHONE_STATE"/> + <permission name="android.permission.INTERACT_ACROSS_USERS"/> + <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/> + </privapp-permissions> +</permissions> diff --git a/configs/privapp-permissions-qti.xml b/permissions/system-privapp-permissions-qti.xml index 556be37..6e4bef0 100644 --- a/configs/privapp-permissions-qti.xml +++ b/permissions/system-privapp-permissions-qti.xml @@ -53,10 +53,4 @@ It allows additional grants on top of privapp-permissions-platform.xml <privapp-permissions package="com.qualcomm.qcrilmsgtunnel"> <permission name="android.permission.INTERACT_ACROSS_USERS"/> </privapp-permissions> - - <privapp-permissions package="org.codeaurora.ims"> - <permission name="android.permission.READ_PRECISE_PHONE_STATE"/> - <permission name="android.permission.INTERACT_ACROSS_USERS"/> - <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/> - </privapp-permissions> </permissions> diff --git a/proprietary-files.txt b/proprietary-files.txt index b500c98..87f5644 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -466,11 +466,8 @@ lib64/lib-imsvt.so lib64/lib-imsvtextutils.so lib64/lib-imsvtutils.so lib64/libdiag_system.so -lib64/libimscamera_jni.so -lib64/libimsmedia_jni.so lib64/librcc.so lib64/vendor.qti.imsrtpservice@1.0.so --priv-app/ims/ims.apk|426be1b83d6f608107d6dcf587080551abeab3e2 vendor/bin/ims_rtp_daemon vendor/bin/imsdatadaemon vendor/bin/imsqmidaemon @@ -492,6 +489,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 vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so|ba5ffc588422c1b0f3ac8135314db2c88d62671e # Keystore |