msm8996-common: Move telephony packages to /system_ext

43 files changed, 70 insertions, 67 deletions

diff --git a/msm8996-common/Android.bp b/msm8996-common/Android.bp
index 6f042d9..fe65b74 100644
--- a/msm8996-common/Android.bp
+++ b/msm8996-common/Android.bp
@@ -85,113 +85,116 @@ cc_prebuilt_library_shared {
 }
 
 android_app_import {
-	name: "QtiTelephonyService",
+	name: "WfdService",
 	owner: "zuk",
-	apk: "proprietary/app/QtiTelephonyService/QtiTelephonyService.apk",
+	apk: "proprietary/priv-app/WfdService/WfdService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
+	privileged: true,
 }
 
 android_app_import {
-	name: "uceShimService",
+	name: "CneApp",
 	owner: "zuk",
-	apk: "proprietary/app/uceShimService/uceShimService.apk",
+	apk: "proprietary/vendor/app/CneApp/CneApp.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
+	soc_specific: true,
 }
 
 android_app_import {
-	name: "WfdService",
+	name: "IWlanService",
 	owner: "zuk",
-	apk: "proprietary/priv-app/WfdService/WfdService.apk",
+	apk: "proprietary/vendor/app/IWlanService/IWlanService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	privileged: true,
+	soc_specific: true,
 }
 
 android_app_import {
-	name: "qcrilmsgtunnel",
+	name: "TimeService",
 	owner: "zuk",
-	apk: "proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk",
+	apk: "proprietary/vendor/app/TimeService/TimeService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	privileged: true,
+	soc_specific: true,
 }
 
 android_app_import {
-	name: "CneApp",
+	name: "PowerOffAlarm",
 	owner: "zuk",
-	apk: "proprietary/vendor/app/CneApp/CneApp.apk",
+	apk: "proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	soc_specific: true,
+	product_specific: true,
 }
 
 android_app_import {
-	name: "IWlanService",
+	name: "QtiTelephonyService",
 	owner: "zuk",
-	apk: "proprietary/vendor/app/IWlanService/IWlanService.apk",
+	apk: "proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	soc_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
-	name: "TimeService",
+	name: "uceShimService",
 	owner: "zuk",
-	apk: "proprietary/vendor/app/TimeService/TimeService.apk",
+	apk: "proprietary/system_ext/app/uceShimService/uceShimService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	soc_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
-	name: "PowerOffAlarm",
+	name: "qcrilmsgtunnel",
 	owner: "zuk",
-	apk: "proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk",
+	apk: "proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	product_specific: true,
+	privileged: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
 	name: "dpmserviceapp",
 	owner: "zuk",
-	apk: "proprietary/product/priv-app/dpmserviceapp/dpmserviceapp.apk",
+	apk: "proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
 	privileged: true,
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
 	name: "ims",
 	owner: "zuk",
-	apk: "proprietary/product/priv-app/ims/ims.apk",
+	apk: "proprietary/system_ext/priv-app/ims/ims.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
 	privileged: true,
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 dex_import {
diff --git a/msm8996-common/msm8996-common-vendor.mk b/msm8996-common/msm8996-common-vendor.mk
index 26412ee..f959198 100644
--- a/msm8996-common/msm8996-common-vendor.mk
+++ b/msm8996-common/msm8996-common-vendor.mk
@@ -15,16 +15,16 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/msm8996-common/proprietary/vendor/firmware/cpp_firmware_v1_10_0.fw:$(TARGET_COPY_OUT_VENDOR)/firmware/cpp_firmware_v1_10_0.fw \
     vendor/zuk/msm8996-common/proprietary/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/wfdservice.rc \
     vendor/zuk/msm8996-common/proprietary/etc/permissions/audiosphere.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/audiosphere.xml \
-    vendor/zuk/msm8996-common/proprietary/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/qcrilhook.xml \
+    vendor/zuk/msm8996-common/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
     vendor/zuk/msm8996-common/proprietary/vendor/etc/permissions/qti_libpermissions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/qti_libpermissions.xml \
     vendor/zuk/msm8996-common/proprietary/vendor/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/qti_permissions.xml \
-    vendor/zuk/msm8996-common/proprietary/etc/permissions/telephonyservice.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/telephonyservice.xml \
+    vendor/zuk/msm8996-common/proprietary/system_ext/etc/permissions/telephonyservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephonyservice.xml \
     vendor/zuk/msm8996-common/proprietary/etc/wfdconfig.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/wfdconfig.xml \
     vendor/zuk/msm8996-common/proprietary/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/wfdconfigsink.xml \
-    vendor/zuk/msm8996-common/proprietary/framework/QtiTelephonyServicelibrary.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/QtiTelephonyServicelibrary.jar \
+    vendor/zuk/msm8996-common/proprietary/system_ext/framework/QtiTelephonyServicelibrary.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/QtiTelephonyServicelibrary.jar \
     vendor/zuk/msm8996-common/proprietary/framework/audiosphere.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/audiosphere.jar \
-    vendor/zuk/msm8996-common/proprietary/framework/qcrilhook.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/qcrilhook.jar \
-    vendor/zuk/msm8996-common/proprietary/framework/qti-telephony-common.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/qti-telephony-common.jar \
+    vendor/zuk/msm8996-common/proprietary/system_ext/framework/qcrilhook.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/qcrilhook.jar \
+    vendor/zuk/msm8996-common/proprietary/system_ext/framework/qti-telephony-common.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/qti-telephony-common.jar \
     vendor/zuk/msm8996-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \
     vendor/zuk/msm8996-common/proprietary/lib/libFileMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libFileMux.so \
     vendor/zuk/msm8996-common/proprietary/lib/libOmxMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libOmxMux.so \
@@ -52,15 +52,15 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/msm8996-common/proprietary/lib/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsrcinterface.so \
     vendor/zuk/msm8996-common/proprietary/lib/vendor.qti.hardware.tui_comm@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib/vendor.qti.hardware.tui_comm@1.0.so \
     vendor/zuk/msm8996-common/proprietary/lib64/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/com.qualcomm.qti.ant@1.0.so \
-    vendor/zuk/msm8996-common/proprietary/lib64/com.qualcomm.qti.imscmservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/com.qualcomm.qti.imscmservice@1.0.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.imscmservice@1.0.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/hw/fingerprint.qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/fingerprint.qcom.so \
-    vendor/zuk/msm8996-common/proprietary/lib64/lib-imscamera.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imscamera.so \
-    vendor/zuk/msm8996-common/proprietary/lib64/lib-imsvideocodec.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imsvideocodec.so \
-    vendor/zuk/msm8996-common/proprietary/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imsvt.so \
-    vendor/zuk/msm8996-common/proprietary/lib64/lib-imsvtextutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imsvtextutils.so \
-    vendor/zuk/msm8996-common/proprietary/lib64/lib-imsvtutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imsvtutils.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/lib-imscamera.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imscamera.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/lib-imsvideocodec.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvideocodec.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvt.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/lib-imsvtextutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtextutils.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/lib-imsvtutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtutils.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/libclearsight.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libclearsight.so \
-    vendor/zuk/msm8996-common/proprietary/lib64/libdiag_system.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libdiag_system.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/libdiag_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdiag_system.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/libfiltergenerator.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libfiltergenerator.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/libjni_clearsight.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libjni_clearsight.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/libjni_filtergenerator.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libjni_filtergenerator.so \
@@ -70,7 +70,7 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/libjni_trueportrait.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libjni_trueportrait.so \
     vendor/zuk/msm8996-common/proprietary/lib64/libjni_ubifocus.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libjni_ubifocus.so \
     vendor/zuk/msm8996-common/proprietary/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmmosal.so \
-    vendor/zuk/msm8996-common/proprietary/lib64/librcc.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/librcc.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/librcc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/librcc.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/libtrueportrait.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtrueportrait.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/libts_face_beautify_hal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libts_face_beautify_hal.so \
     vendor/zuk/msm8996-common/proprietary/lib64/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libwfdclient.so \
@@ -81,30 +81,30 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.gnss@2.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.gnss@2.0.so \
     vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.gnss@2.1.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.gnss@2.1.so \
     vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.hardware.tui_comm@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.hardware.tui_comm@1.0.so \
-    vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.imsrtpservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.imsrtpservice@1.0.so \
-    vendor/zuk/msm8996-common/proprietary/product/bin/dpmd:$(TARGET_COPY_OUT_PRODUCT)/bin/dpmd \
-    vendor/zuk/msm8996-common/proprietary/product/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/dpm/dpm.conf \
-    vendor/zuk/msm8996-common/proprietary/product/etc/init/dpmd.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/dpmd.rc \
-    vendor/zuk/msm8996-common/proprietary/product/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.qti.dpmframework.xml \
-    vendor/zuk/msm8996-common/proprietary/product/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/dpmapi.xml \
-    vendor/zuk/msm8996-common/proprietary/product/framework/com.qti.dpmframework.jar:$(TARGET_COPY_OUT_PRODUCT)/framework/com.qti.dpmframework.jar \
-    vendor/zuk/msm8996-common/proprietary/product/framework/dpmapi.jar:$(TARGET_COPY_OUT_PRODUCT)/framework/dpmapi.jar \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@1.0.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \
+    vendor/zuk/msm8996-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
+    vendor/zuk/msm8996-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
+    vendor/zuk/msm8996-common/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \
+    vendor/zuk/msm8996-common/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
+    vendor/zuk/msm8996-common/proprietary/system_ext/framework/com.qti.dpmframework.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.qti.dpmframework.jar \
+    vendor/zuk/msm8996-common/proprietary/system_ext/framework/dpmapi.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/dpmapi.jar \
     vendor/zuk/msm8996-common/proprietary/product/framework/vendor.qti.hardware.alarm-V1.0-java.jar:$(TARGET_COPY_OUT_PRODUCT)/framework/vendor.qti.hardware.alarm-V1.0-java.jar \
     vendor/zuk/msm8996-common/proprietary/product/lib/vendor.display.color@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib/vendor.display.color@1.0.so \
     vendor/zuk/msm8996-common/proprietary/product/lib/vendor.display.postproc@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib/vendor.display.postproc@1.0.so \
     vendor/zuk/msm8996-common/proprietary/product/lib/vendor.qti.hardware.qdutils_disp@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib/vendor.qti.hardware.qdutils_disp@1.0.so \
-    vendor/zuk/msm8996-common/proprietary/product/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \
-    vendor/zuk/msm8996-common/proprietary/product/lib64/com.quicinc.cne.api@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.api@1.0.so \
-    vendor/zuk/msm8996-common/proprietary/product/lib64/com.quicinc.cne.api@1.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.api@1.1.so \
-    vendor/zuk/msm8996-common/proprietary/product/lib64/com.quicinc.cne.constants@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.constants@1.0.so \
-    vendor/zuk/msm8996-common/proprietary/product/lib64/com.quicinc.cne.constants@2.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.constants@2.0.so \
-    vendor/zuk/msm8996-common/proprietary/product/lib64/com.quicinc.cne.constants@2.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.constants@2.1.so \
-    vendor/zuk/msm8996-common/proprietary/product/lib64/libdpmctmgr.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libdpmctmgr.so \
-    vendor/zuk/msm8996-common/proprietary/product/lib64/libdpmfdmgr.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libdpmfdmgr.so \
-    vendor/zuk/msm8996-common/proprietary/product/lib64/libdpmframework.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libdpmframework.so \
-    vendor/zuk/msm8996-common/proprietary/product/lib64/libdpmtcm.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libdpmtcm.so \
-    vendor/zuk/msm8996-common/proprietary/product/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libimscamera_jni.so \
-    vendor/zuk/msm8996-common/proprietary/product/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libimsmedia_jni.so \
+    vendor/zuk/msm8996-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 \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.quicinc.cne.api@1.0.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.quicinc.cne.api@1.1.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.quicinc.cne.constants@1.0.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.quicinc.cne.constants@2.0.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.quicinc.cne.constants@2.1.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/libdpmctmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmctmgr.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/libdpmfdmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmfdmgr.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/libdpmframework.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmframework.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/libdpmtcm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmtcm.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimscamera_jni.so \
+    vendor/zuk/msm8996-common/proprietary/system_ext/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimsmedia_jni.so \
     vendor/zuk/msm8996-common/proprietary/product/lib64/vendor.display.color@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.display.color@1.0.so \
     vendor/zuk/msm8996-common/proprietary/product/lib64/vendor.display.postproc@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.display.postproc@1.0.so \
     vendor/zuk/msm8996-common/proprietary/product/lib64/vendor.qti.hardware.qdutils_disp@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.qdutils_disp@1.0.so \
@@ -654,14 +654,14 @@ PRODUCT_PACKAGES += \
     libgpustats \
     libsdm-disp-vndapis \
     libthermalclient \
-    QtiTelephonyService \
-    uceShimService \
     WfdService \
-    qcrilmsgtunnel \
     CneApp \
     IWlanService \
     TimeService \
     PowerOffAlarm \
+    QtiTelephonyService \
+    uceShimService \
+    qcrilmsgtunnel \
     dpmserviceapp \
     ims \
     WfdCommon
diff --git a/msm8996-common/proprietary/framework/QtiTelephonyServicelibrary.jar b/msm8996-common/proprietary/framework/QtiTelephonyServicelibrary.jar
deleted file mode 100644
index a15b4e5..0000000
--- a/msm8996-common/proprietary/framework/QtiTelephonyServicelibrary.jar
+++ /dev/null
diff --git a/msm8996-common/proprietary/framework/qti-telephony-common.jar b/msm8996-common/proprietary/framework/qti-telephony-common.jar
deleted file mode 100644
index 0c84b46..0000000
--- a/msm8996-common/proprietary/framework/qti-telephony-common.jar
+++ /dev/null
diff --git a/msm8996-common/proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk b/msm8996-common/proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
deleted file mode 100644
index 9f23f85..0000000
--- a/msm8996-common/proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+++ /dev/null
diff --git a/msm8996-common/proprietary/app/QtiTelephonyService/QtiTelephonyService.apk b/msm8996-common/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
index 5478209..5478209 100644
--- a/msm8996-common/proprietary/app/QtiTelephonyService/QtiTelephonyService.apk
+++ b/msm8996-common/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
diff --git a/msm8996-common/proprietary/app/uceShimService/uceShimService.apk b/msm8996-common/proprietary/system_ext/app/uceShimService/uceShimService.apk
index be8d1d0..be8d1d0 100644
--- a/msm8996-common/proprietary/app/uceShimService/uceShimService.apk
+++ b/msm8996-common/proprietary/system_ext/app/uceShimService/uceShimService.apk
diff --git a/msm8996-common/proprietary/product/bin/dpmd b/msm8996-common/proprietary/system_ext/bin/dpmd
index 81e24ac..81e24ac 100755
--- a/msm8996-common/proprietary/product/bin/dpmd
+++ b/msm8996-common/proprietary/system_ext/bin/dpmd
diff --git a/msm8996-common/proprietary/product/etc/dpm/dpm.conf b/msm8996-common/proprietary/system_ext/etc/dpm/dpm.conf
index 8543e67..8543e67 100644
--- a/msm8996-common/proprietary/product/etc/dpm/dpm.conf
+++ b/msm8996-common/proprietary/system_ext/etc/dpm/dpm.conf
diff --git a/msm8996-common/proprietary/product/etc/init/dpmd.rc b/msm8996-common/proprietary/system_ext/etc/init/dpmd.rc
index c102f2a..529ceb5 100644
--- a/msm8996-common/proprietary/product/etc/init/dpmd.rc
+++ b/msm8996-common/proprietary/system_ext/etc/init/dpmd.rc
@@ -9,7 +9,7 @@ on post-fs-data
     chown system system /data/dpm
 
 #start dpmd service
-service dpmd /system/product/bin/dpmd
+service dpmd /system/system_ext/bin/dpmd
     class late_start
     socket dpmd stream 660 root radio
     socket tcm  stream 660 root inet
diff --git a/msm8996-common/proprietary/product/etc/permissions/com.qti.dpmframework.xml b/msm8996-common/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml
index 622daff..65a086e 100644
--- a/msm8996-common/proprietary/product/etc/permissions/com.qti.dpmframework.xml
+++ b/msm8996-common/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml
@@ -4,7 +4,7 @@
     Confidential and Proprietary - Qualcomm Technologies, Inc.-->
 <permissions>
     <library name="com.qti.dpmframework"
-        file="/system/product/framework/com.qti.dpmframework.jar"/>
+        file="/system/system_ext/framework/com.qti.dpmframework.jar"/>
     <permission name="com.qualcomm.permission.READPROC" >
     <group gid="readproc" />
     </permission>
diff --git a/msm8996-common/proprietary/product/etc/permissions/dpmapi.xml b/msm8996-common/proprietary/system_ext/etc/permissions/dpmapi.xml
index cc5ece1..c10e080 100644
--- a/msm8996-common/proprietary/product/etc/permissions/dpmapi.xml
+++ b/msm8996-common/proprietary/system_ext/etc/permissions/dpmapi.xml
@@ -2,5 +2,5 @@
 <!--Copyright (c) 2014, 2019 Qualcomm Technologies, Inc.  All Rights Reserved. Qualcomm Technologies Proprietary and Confidential.-->
 <permissions>
     <library name="com.qti.dpmapi"
-        file="/system/product/framework/dpmapi.jar"/>
+        file="/system/system_ext/framework/dpmapi.jar"/>
 </permissions>
diff --git a/msm8996-common/proprietary/etc/permissions/qcrilhook.xml b/msm8996-common/proprietary/system_ext/etc/permissions/qcrilhook.xml
index 6ca9c57..ece95b1 100644
--- a/msm8996-common/proprietary/etc/permissions/qcrilhook.xml
+++ b/msm8996-common/proprietary/system_ext/etc/permissions/qcrilhook.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <permissions>
  <library name="com.qualcomm.qcrilhook"
-          file="/system/framework/qcrilhook.jar"/>
+          file="/system/system_ext/framework/qcrilhook.jar"/>
 </permissions>
diff --git a/msm8996-common/proprietary/etc/permissions/telephonyservice.xml b/msm8996-common/proprietary/system_ext/etc/permissions/telephonyservice.xml
index 2cf6213..6fe1cd2 100644
--- a/msm8996-common/proprietary/etc/permissions/telephonyservice.xml
+++ b/msm8996-common/proprietary/system_ext/etc/permissions/telephonyservice.xml
@@ -7,5 +7,5 @@ Qualcomm Technologies Proprietary and Confidential.
 
 <permissions>
 <library name="com.qualcomm.qti.QtiTelephonyServicelibrary"
-         file="/system/framework/QtiTelephonyServicelibrary.jar"/>
+         file="/system/system_ext/framework/QtiTelephonyServicelibrary.jar"/>
 </permissions>
diff --git a/msm8996-common/proprietary/system_ext/framework/QtiTelephonyServicelibrary.jar b/msm8996-common/proprietary/system_ext/framework/QtiTelephonyServicelibrary.jar
new file mode 100644
index 0000000..280616f
--- /dev/null
+++ b/msm8996-common/proprietary/system_ext/framework/QtiTelephonyServicelibrary.jar
diff --git a/msm8996-common/proprietary/product/framework/com.qti.dpmframework.jar b/msm8996-common/proprietary/system_ext/framework/com.qti.dpmframework.jar
index 15c8073..15c8073 100644
--- a/msm8996-common/proprietary/product/framework/com.qti.dpmframework.jar
+++ b/msm8996-common/proprietary/system_ext/framework/com.qti.dpmframework.jar
diff --git a/msm8996-common/proprietary/product/framework/dpmapi.jar b/msm8996-common/proprietary/system_ext/framework/dpmapi.jar
index 851f343..851f343 100644
--- a/msm8996-common/proprietary/product/framework/dpmapi.jar
+++ b/msm8996-common/proprietary/system_ext/framework/dpmapi.jar
diff --git a/msm8996-common/proprietary/framework/qcrilhook.jar b/msm8996-common/proprietary/system_ext/framework/qcrilhook.jar
index d147750..d147750 100644
--- a/msm8996-common/proprietary/framework/qcrilhook.jar
+++ b/msm8996-common/proprietary/system_ext/framework/qcrilhook.jar
diff --git a/msm8996-common/proprietary/system_ext/framework/qti-telephony-common.jar b/msm8996-common/proprietary/system_ext/framework/qti-telephony-common.jar
new file mode 100644
index 0000000..01390ec
--- /dev/null
+++ b/msm8996-common/proprietary/system_ext/framework/qti-telephony-common.jar
diff --git a/msm8996-common/proprietary/product/lib64/com.qualcomm.qti.dpm.api@1.0.so b/msm8996-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so
index 2af751d..2af751d 100644
--- a/msm8996-common/proprietary/product/lib64/com.qualcomm.qti.dpm.api@1.0.so
+++ b/msm8996-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so
diff --git a/msm8996-common/proprietary/lib64/com.qualcomm.qti.imscmservice@1.0.so b/msm8996-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so
index 2aba7ac..2aba7ac 100644
--- a/msm8996-common/proprietary/lib64/com.qualcomm.qti.imscmservice@1.0.so
+++ b/msm8996-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so
diff --git a/msm8996-common/proprietary/product/lib64/com.quicinc.cne.api@1.0.so b/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.0.so
index 4dea150..4dea150 100644
--- a/msm8996-common/proprietary/product/lib64/com.quicinc.cne.api@1.0.so
+++ b/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.0.so
diff --git a/msm8996-common/proprietary/product/lib64/com.quicinc.cne.api@1.1.so b/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.1.so
index 14d0930..14d0930 100644
--- a/msm8996-common/proprietary/product/lib64/com.quicinc.cne.api@1.1.so
+++ b/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.1.so
diff --git a/msm8996-common/proprietary/product/lib64/com.quicinc.cne.constants@1.0.so b/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@1.0.so
index f2b1bdd..f2b1bdd 100644
--- a/msm8996-common/proprietary/product/lib64/com.quicinc.cne.constants@1.0.so
+++ b/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@1.0.so
diff --git a/msm8996-common/proprietary/product/lib64/com.quicinc.cne.constants@2.0.so b/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.0.so
index a8afff3..a8afff3 100644
--- a/msm8996-common/proprietary/product/lib64/com.quicinc.cne.constants@2.0.so
+++ b/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.0.so
diff --git a/msm8996-common/proprietary/product/lib64/com.quicinc.cne.constants@2.1.so b/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.1.so
index 5a6ba95..5a6ba95 100644
--- a/msm8996-common/proprietary/product/lib64/com.quicinc.cne.constants@2.1.so
+++ b/msm8996-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.1.so
diff --git a/msm8996-common/proprietary/lib64/lib-imscamera.so b/msm8996-common/proprietary/system_ext/lib64/lib-imscamera.so
index 94db054..94db054 100644
--- a/msm8996-common/proprietary/lib64/lib-imscamera.so
+++ b/msm8996-common/proprietary/system_ext/lib64/lib-imscamera.so
diff --git a/msm8996-common/proprietary/lib64/lib-imsvideocodec.so b/msm8996-common/proprietary/system_ext/lib64/lib-imsvideocodec.so
index 83041ad..83041ad 100644
--- a/msm8996-common/proprietary/lib64/lib-imsvideocodec.so
+++ b/msm8996-common/proprietary/system_ext/lib64/lib-imsvideocodec.so
diff --git a/msm8996-common/proprietary/lib64/lib-imsvt.so b/msm8996-common/proprietary/system_ext/lib64/lib-imsvt.so
index 33f8583..33f8583 100644
--- a/msm8996-common/proprietary/lib64/lib-imsvt.so
+++ b/msm8996-common/proprietary/system_ext/lib64/lib-imsvt.so
diff --git a/msm8996-common/proprietary/lib64/lib-imsvtextutils.so b/msm8996-common/proprietary/system_ext/lib64/lib-imsvtextutils.so
index b00d3c6..b00d3c6 100644
--- a/msm8996-common/proprietary/lib64/lib-imsvtextutils.so
+++ b/msm8996-common/proprietary/system_ext/lib64/lib-imsvtextutils.so
diff --git a/msm8996-common/proprietary/lib64/lib-imsvtutils.so b/msm8996-common/proprietary/system_ext/lib64/lib-imsvtutils.so
index 9ee2a8d..9ee2a8d 100644
--- a/msm8996-common/proprietary/lib64/lib-imsvtutils.so
+++ b/msm8996-common/proprietary/system_ext/lib64/lib-imsvtutils.so
diff --git a/msm8996-common/proprietary/lib64/libdiag_system.so b/msm8996-common/proprietary/system_ext/lib64/libdiag_system.so
index 3ced9cf..3ced9cf 100644
--- a/msm8996-common/proprietary/lib64/libdiag_system.so
+++ b/msm8996-common/proprietary/system_ext/lib64/libdiag_system.so
diff --git a/msm8996-common/proprietary/product/lib64/libdpmctmgr.so b/msm8996-common/proprietary/system_ext/lib64/libdpmctmgr.so
index 8d225bd..8d225bd 100644
--- a/msm8996-common/proprietary/product/lib64/libdpmctmgr.so
+++ b/msm8996-common/proprietary/system_ext/lib64/libdpmctmgr.so
diff --git a/msm8996-common/proprietary/product/lib64/libdpmfdmgr.so b/msm8996-common/proprietary/system_ext/lib64/libdpmfdmgr.so
index 1764bdc..1764bdc 100644
--- a/msm8996-common/proprietary/product/lib64/libdpmfdmgr.so
+++ b/msm8996-common/proprietary/system_ext/lib64/libdpmfdmgr.so
diff --git a/msm8996-common/proprietary/product/lib64/libdpmframework.so b/msm8996-common/proprietary/system_ext/lib64/libdpmframework.so
index 42f6ebd..42f6ebd 100644
--- a/msm8996-common/proprietary/product/lib64/libdpmframework.so
+++ b/msm8996-common/proprietary/system_ext/lib64/libdpmframework.so
diff --git a/msm8996-common/proprietary/product/lib64/libdpmtcm.so b/msm8996-common/proprietary/system_ext/lib64/libdpmtcm.so
index 086cd5c..086cd5c 100644
--- a/msm8996-common/proprietary/product/lib64/libdpmtcm.so
+++ b/msm8996-common/proprietary/system_ext/lib64/libdpmtcm.so
diff --git a/msm8996-common/proprietary/product/lib64/libimscamera_jni.so b/msm8996-common/proprietary/system_ext/lib64/libimscamera_jni.so
index 74f6dba..74f6dba 100644
--- a/msm8996-common/proprietary/product/lib64/libimscamera_jni.so
+++ b/msm8996-common/proprietary/system_ext/lib64/libimscamera_jni.so
diff --git a/msm8996-common/proprietary/product/lib64/libimsmedia_jni.so b/msm8996-common/proprietary/system_ext/lib64/libimsmedia_jni.so
index b8e4e64..b8e4e64 100644
--- a/msm8996-common/proprietary/product/lib64/libimsmedia_jni.so
+++ b/msm8996-common/proprietary/system_ext/lib64/libimsmedia_jni.so
diff --git a/msm8996-common/proprietary/lib64/librcc.so b/msm8996-common/proprietary/system_ext/lib64/librcc.so
index 4bac253..4bac253 100644
--- a/msm8996-common/proprietary/lib64/librcc.so
+++ b/msm8996-common/proprietary/system_ext/lib64/librcc.so
diff --git a/msm8996-common/proprietary/lib64/vendor.qti.imsrtpservice@1.0.so b/msm8996-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@1.0.so
index 81caed1..81caed1 100644
--- a/msm8996-common/proprietary/lib64/vendor.qti.imsrtpservice@1.0.so
+++ b/msm8996-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@1.0.so
diff --git a/msm8996-common/proprietary/product/priv-app/dpmserviceapp/dpmserviceapp.apk b/msm8996-common/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk
index c50e455..c50e455 100644
--- a/msm8996-common/proprietary/product/priv-app/dpmserviceapp/dpmserviceapp.apk
+++ b/msm8996-common/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk
diff --git a/msm8996-common/proprietary/product/priv-app/ims/ims.apk b/msm8996-common/proprietary/system_ext/priv-app/ims/ims.apk
index a7fafc1..a7fafc1 100644
--- a/msm8996-common/proprietary/product/priv-app/ims/ims.apk
+++ b/msm8996-common/proprietary/system_ext/priv-app/ims/ims.apk
diff --git a/msm8996-common/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk b/msm8996-common/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
new file mode 100644
index 0000000..5cc43c4
--- /dev/null
+++ b/msm8996-common/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk