From 65e4195716778f3f3d3918223f5729e31ecff4e4 Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Mon, 16 Sep 2019 17:40:51 +0800
Subject: [PATCH] sdm660-common: Create system copy of ims-ext-common and add
 to classpath

* Our ims.apk doesn't load ims-ext-common.jar, and it's moved to /product
   on 10 where PRODUCT_BOOT_JARS doesn't work.
 * Create a system copy of the jar and add it to boot classpath to make
   it loadable from the apk without extra work,

Change-Id: Ia530a530bd4469e12500410fc5e8ba393de60b18
---
 ims/Android.bp | 7 +++++++
 sdm660.mk      | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 ims/Android.bp

diff --git a/ims/Android.bp b/ims/Android.bp
new file mode 100644
index 00000000..7d97b3cc
--- /dev/null
+++ b/ims/Android.bp
@@ -0,0 +1,7 @@
+java_library {
+    name: "ims-ext-common_system",
+    installable: true,
+    static_libs: [
+        "ims-ext-common",
+    ],
+}
diff --git a/sdm660.mk b/sdm660.mk
index ac7f80fa..aa345031 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -405,7 +405,7 @@ PRODUCT_PACKAGES += \
     libprotobuf-cpp-full
 
 PRODUCT_PACKAGES += \
-    ims-ext-common \
+    ims-ext-common_system \
     ims_ext_common.xml \
     qti-telephony-hidl-wrapper \
     qti_telephony_hidl_wrapper.xml \
@@ -414,6 +414,7 @@ PRODUCT_PACKAGES += \
     telephony-ext
 
 PRODUCT_BOOT_JARS += \
+    ims-ext-common_system \
     telephony-ext
 
 # Seccomp policy