msm8996-common: Update ims.apk from daisy Q

* From QKQ1.191002.002 V11.0.2.0.QDLMIXM

8 files changed, 15 insertions, 14 deletions

diff --git a/msm8996-common/Android.bp b/msm8996-common/Android.bp
index 50bfe00..6f042d9 100644
--- a/msm8996-common/Android.bp
+++ b/msm8996-common/Android.bp
@@ -116,17 +116,6 @@ android_app_import {
 }
 
 android_app_import {
-	name: "ims",
-	owner: "zuk",
-	apk: "proprietary/priv-app/ims/ims.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-}
-
-android_app_import {
 	name: "qcrilmsgtunnel",
 	owner: "zuk",
 	apk: "proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk",
@@ -193,6 +182,18 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "ims",
+	owner: "zuk",
+	apk: "proprietary/product/priv-app/ims/ims.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
 dex_import {
 	name: "WfdCommon",
 	owner: "zuk",
diff --git a/msm8996-common/msm8996-common-vendor.mk b/msm8996-common/msm8996-common-vendor.mk
index e29f0d5..5af165e 100644
--- a/msm8996-common/msm8996-common-vendor.mk
+++ b/msm8996-common/msm8996-common-vendor.mk
@@ -65,8 +65,6 @@ PRODUCT_COPY_FILES += \
     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/vendor/lib64/libfiltergenerator.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libfiltergenerator.so \
-    vendor/zuk/msm8996-common/proprietary/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libimscamera_jni.so \
-    vendor/zuk/msm8996-common/proprietary/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libimsmedia_jni.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 \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/libjni_makeupV2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libjni_makeupV2.so \
@@ -108,6 +106,8 @@ PRODUCT_COPY_FILES += \
     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/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 \
@@ -661,11 +661,11 @@ PRODUCT_PACKAGES += \
     QtiTelephonyService \
     uceShimService \
     WfdService \
-    ims \
     qcrilmsgtunnel \
     CneApp \
     IWlanService \
     TimeService \
     PowerOffAlarm \
     dpmserviceapp \
+    ims \
     WfdCommon
diff --git a/msm8996-common/proprietary/lib64/libimscamera_jni.so b/msm8996-common/proprietary/lib64/libimscamera_jni.so
deleted file mode 100644
index 178e731..0000000
--- a/msm8996-common/proprietary/lib64/libimscamera_jni.so
+++ /dev/null
diff --git a/msm8996-common/proprietary/lib64/libimsmedia_jni.so b/msm8996-common/proprietary/lib64/libimsmedia_jni.so
deleted file mode 100644
index e802498..0000000
--- a/msm8996-common/proprietary/lib64/libimsmedia_jni.so
+++ /dev/null
diff --git a/msm8996-common/proprietary/priv-app/ims/ims.apk b/msm8996-common/proprietary/priv-app/ims/ims.apk
deleted file mode 100644
index 9170d43..0000000
--- a/msm8996-common/proprietary/priv-app/ims/ims.apk
+++ /dev/null
diff --git a/msm8996-common/proprietary/product/lib64/libimscamera_jni.so b/msm8996-common/proprietary/product/lib64/libimscamera_jni.so
new file mode 100644
index 0000000..74f6dba
--- /dev/null
+++ b/msm8996-common/proprietary/product/lib64/libimscamera_jni.so
diff --git a/msm8996-common/proprietary/product/lib64/libimsmedia_jni.so b/msm8996-common/proprietary/product/lib64/libimsmedia_jni.so
new file mode 100644
index 0000000..b8e4e64
--- /dev/null
+++ b/msm8996-common/proprietary/product/lib64/libimsmedia_jni.so
diff --git a/msm8996-common/proprietary/product/priv-app/ims/ims.apk b/msm8996-common/proprietary/product/priv-app/ims/ims.apk
new file mode 100644
index 0000000..a7fafc1
--- /dev/null
+++ b/msm8996-common/proprietary/product/priv-app/ims/ims.apk