From e51b238a4f88cd3dfffbc5b0d10490428a568172 Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Thu, 23 Dec 2021 15:10:00 +0800
Subject: [PATCH] sm8250-common: Move moto-telephony.jar to system_ext and
 remove unused moto jar

 * moto-telephony.jar is a dependence of ims.apk and thus should locate
   in system_ext as well.
 * The rest jars are not needed as far as I observe.

Change-Id: I0711c0178906293179998eae70663de7b09a4a77
---
 extract-files.sh      |  8 ++++++++
 proprietary-files.txt | 11 +++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/extract-files.sh b/extract-files.sh
index 12c53a4..f1c458a 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -58,6 +58,14 @@ if [ -z "${SRC}" ]; then
     SRC="adb"
 fi
 
+function blob_fixup() {
+    case "${1}" in
+        system_ext/etc/permissions/moto-telephony.xml)
+            sed -i "s#/system/#/system_ext/#" "${2}"
+            ;;
+    esac
+}
+
 if [ -z "${ONLY_TARGET}" ]; then
     # Initialize the helper for common device
     setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}"
diff --git a/proprietary-files.txt b/proprietary-files.txt
index f9c6442..f17837a 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -808,14 +808,9 @@ vendor/radio/qcril_database/upgrade/7_version_qcrildb.sql
 vendor/radio/qcril_database/upgrade/8_version_qcrildb.sql
 vendor/radio/qcril_database/upgrade/9_version_qcrildb.sql
 
-# Telephony - qti-telephony-common
-etc/permissions/moto-ims-ext.xml
-etc/permissions/moto-settings.xml
-etc/permissions/moto-telephony.xml
-framework/moto-ims-ext.jar
-framework/moto-settings.jar
-framework/moto-telephony.jar
-system_ext/framework/qcom-moto-ims-ext.jar
+# Telephony - Moto
+etc/permissions/moto-telephony.xml:system_ext/etc/permissions/moto-telephony.xml
+framework/moto-telephony.jar:system_ext/framework/moto-telephony.jar
 
 # RIL - IMS
 -system_ext/priv-app/ims/ims.apk