msm8996-common: Remove privapp-permissions-oem.xml and move qti's xml to /system

  * privapp-permissions-qti.xml does the same and more.

  * Move back qti_whitelist.xml and privapp-permissions-qti.xml
  to /system as it's the right place:

  https://source.android.com/devices/tech/config/perms-whitelist#adding-whitelists

2 files changed, 2 insertions, 13 deletions

diff --git a/configs/privapp-permissions-oem.xml b/configs/privapp-permissions-oem.xml
deleted file mode 100644
index 7da245c..0000000
--- a/configs/privapp-permissions-oem.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="com.qualcomm.location">
-        <permission name="android.permission.CONTROL_LOCATION_UPDATES"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-</permissions>
diff --git a/msm8996.mk b/msm8996.mk
index 3266857..63af52b 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -317,9 +317,8 @@ PRODUCT_COPY_FILES += \
 
 # QCOM
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/privapp-permissions-oem.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/privapp-permissions-oem.xml \
-    $(LOCAL_PATH)/configs/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/privapp-permissions-qti.xml \
-    $(LOCAL_PATH)/configs/qti_whitelist.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/qti_whitelist.xml
+    $(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
 
 # QMI
 PRODUCT_PACKAGES += \