From 5471e2ec34bd75d9df77c1e11d85d6f81a078805 Mon Sep 17 00:00:00 2001
From: Marc Bourgoin <themard85@gmail.com>
Date: Sat, 19 Oct 2024 22:54:09 -0600
Subject: [PATCH] rtwo: Modify MotCamera4.apk automatically during extract

Change-Id: I9431d02b5202c25d5c9d9274fecba8c2cd6c4419
---
 ...0001_MotCamera4-Set-target-SDK-to-30.patch | 25 +++++++++
 extract-files.sh                              | 21 +++++++
 proprietary-files.txt                         | 55 +------------------
 3 files changed, 47 insertions(+), 54 deletions(-)
 create mode 100644 MotCamera4-patches/0001_MotCamera4-Set-target-SDK-to-30.patch

diff --git a/MotCamera4-patches/0001_MotCamera4-Set-target-SDK-to-30.patch b/MotCamera4-patches/0001_MotCamera4-Set-target-SDK-to-30.patch
new file mode 100644
index 0000000..7946a21
--- /dev/null
+++ b/MotCamera4-patches/0001_MotCamera4-Set-target-SDK-to-30.patch
@@ -0,0 +1,25 @@
+From 9c048608e35b8d00661312f3156886d4accd2885 Mon Sep 17 00:00:00 2001
+From: Marc Bourgoin <themard85@gmail.com>
+Date: Thu, 2 May 2024 23:15:02 -0600
+Subject: [PATCH] MotCamera4: Set target SDK to 30
+
+https://github.com/LineageOS/android_frameworks_base/commit/8e742f928e0b3d242a290fb46d80a2c892dd18a3
+---
+ apktool.yml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/apktool.yml b/apktool.yml
+index 8d11ce7b..d298a15a 100644
+--- a/apktool.yml
++++ b/apktool.yml
+@@ -6,8 +6,8 @@ usesFramework:
+   - 1
+   tag: null
+ sdkInfo:
+-  minSdkVersion: 31
+-  targetSdkVersion: 33
++  minSdkVersion: 30
++  targetSdkVersion: 30
+ packageInfo:
+   forcedPackageId: 127
+   renameManifestPackage: null
diff --git a/extract-files.sh b/extract-files.sh
index b488f1b..c99bdea 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -6,6 +6,27 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+function blob_fixup() {
+    case "${1}" in
+        product/priv-app/MotCamera4/MotCamera4.apk)
+            apktool_patch "${2}" "$MY_DIR/MotCamera4-patches"
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+
+    return 0
+}
+
+function blob_fixup_dry() {
+    blob_fixup "$1" ""
+}
+
 # If we're being sourced by the common script that we called,
 # stop right here. No need to go down the rabbit hole.
 if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 58051ea..8158b67 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -595,6 +595,7 @@ product/etc/permissions/com.motorola.camera3.xml
 product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml
 product/etc/permissions/privapp-permissions-com.motorola.camera3.xml
 product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml
+product/priv-app/MotCamera4/MotCamera4.apk
 system/app/MotoSignatureApp/MotoSignatureApp.apk;PRESIGNED
 system/etc/permissions/com.motorola.motosignature.xml
 system/etc/permissions/moto-core_services.xml
@@ -605,60 +606,6 @@ system/framework/moto-settings.jar
 system_ext/bin/motsettings
 system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk
 
-# MotCamera4 - from rtwo - rtwo_g-user 14 U1TRS34.8-30-13-1 7c77a-12bae6 release-keys - RETAIL variant
-product/priv-app/MotCamera4/MotCamera4.apk|1bfeb525a80e0716c202e26e7e7547b6f0d084a6
-product/lib64/libAncHumanSegFigureFusion-jni.so|29b3f53abf695f59093fa789cffaf79771b49568
-product/lib64/libarcsoft_dualcam_refocus.so|20d0f35c3b79feb8c0f08691c9fab60bd119d390
-product/lib64/libarcsoft_frc_8450.so|f3fb1ba96d9fa1e8685708aeb18242bad5b2b649
-product/lib64/libarcsoft_hdr_detection.so|183828de2e0959a9185bfd55aa740096658a7b38
-product/lib64/libarcsoft_high_dynamic_range.so|5b377a50612bafb30af4cb271327053abfe88a32
-product/lib64/libarcsoft_high_dynamic_range_v4_dxo.so|59ec743d82625d4c15dd73e42d316e7791dd7404
-product/lib64/libarcsoft_multiframe_bokeh_image_dxo.so|df6b1e69da59a2efd4b1a27096f619443e688fad
-product/lib64/libarcsoft_portrait_distortion_correction.so|41a1b0fd87ef6790ced3bb0ae8bb5da536b1d7a7
-product/lib64/libarcsoft_scbokeh_Adreno730.so|2f56681b6ea99b984907d825c401d682cd32fed4
-product/lib64/libas-super-slow-motion.so|22ee235276afaf0adfae115b23f9ca4988430222
-product/lib64/libbarhopper_v3.so|156387210e424f30d2642edeff2a549d77808abd
-product/lib64/libbg-postproc-jni.so|b314b644b08080f3f94772f68111aca2b2d49df6
-product/lib64/libcamerax_extension_jni.so|adc9aa771b2848b91692f1e0b24e289358cee24c
-product/lib64/libc++_shared.so|dbbd9e4d06e2566c31bdc744dd7391536a780cc6
-product/lib64/libc++.so|e8707820517ab7713b8ca6ac4462361e00629c26
-product/lib64/libdoc-util.so|939b191e239c8d74e9b4b7498a0092d1c92453f7
-product/lib64/libdynamic_depth.so|515f03132a086f15c565dd89b192ede5eeca7e29
-product/lib64/libfn-beauty-vfb-v8-base.so|315109d3fb3b956b2849e3b8fbd4e059e12eb194
-product/lib64/libFNVfbEngineHAL_v8.so|490c858d9978cbeebb4a666c8434081b627e70d9
-product/lib64/libfoundation.so|7f5fc2065bff33cc90441d2708b0e6f88bf2a3d7
-product/lib64/libgg-dynamic_depth.so|58432b1f6c8d93cf5eee854b3bbeb118a5b5b7a3
-product/lib64/libgg-tensorflow-lite.so|93921a3972fdbe9fa739069e6b06d59ef1acb123
-product/lib64/libgif.so|310d708f0c9b60c065514c1e3f1534c8ba347c7d
-product/lib64/libjpeg.so|a51f6dde2a6d7eb11378a2575a5e6bf625a15bbb
-product/lib64/liblenovo_panorama.so|c5f77c76f3106e0332db07a33b086fcc68c8380b
-product/lib64/libmcf-base.so|77193c9b2135bdeefa4e73551954ccead6f00819
-product/lib64/libmcf-jni.so|af9ac9d45a88332becd92635ac2abd6c00ddd7d9
-product/lib64/libmcf-qc-fd-offline_local.so|99d2dbab152e22d6ae3d552cee3a172fc886ba24
-product/lib64/libmcf-stand-alone-sm.so|04b943829ffedc9adfc3e45eeae2626fb076eb52
-product/lib64/libmeishe-nv-effects-thumbnails.so|9308643101d3091944ac231b17ed0f4dbb704a51
-product/lib64/libmmcamera_faceproc2.so|1c732d58bf24c939f568cda340318e5b873dce3b
-product/lib64/libmorpho_panorama_gp3_core.so|d55d6ded33e88c9456f421ca7a264093b2a98b00
-product/lib64/libmorpho_panorama_gp3.so|239287acb6bbb790b793538030d219742a1ff5d0
-product/lib64/libmorpho_sensor_fusion.so|bbbdfc2b980c3c5810a7d26f14c735c1b64a2af9
-product/lib64/libmot-cinemagraph-engine.so|ce01e88791e13f1c72c9e6435007a88e383c2c2f
-product/lib64/libmot_trigger_v3_lib.so|0f0b98969db46358184d72073814542e5ac0753d
-product/lib64/libmot_trigger_v3.so|6a2f0cf8cc53d2246f856846f789f64e60b1459a
-product/lib64/libmot-util.so|4d0d15925084ee62505c0340302450fd55e03a2f
-product/lib64/libmpbase.so|07021c39abbc5c8538f6df1876a3eb3015ff9c2a
-product/lib64/libNvBeautyEffect.so|cd80f5049b2f668379f1d3ecbf6e6206de20a46d
-product/lib64/libNvEffectSdkCore.so|0b4c75bb8f043c1a85ab43c63be36b6ad6d768ba
-product/lib64/libomp.so|670a2c0acfb4344006ab0dfd9f3d1c5b5b228c17
-product/lib64/libpostproc-transfer-data.so|e7ce9e4452066fdb60fa025728a01858677f7d94
-product/lib64/libqc-snpe.so|a2786bb1918f1d7b351302ee29fb22c4595c9556
-product/lib64/libsmart_ppt.so|1ba24a17a049e175e5509a9ea1cba38940159efc
-product/lib64/libSuperSensorCPU_v11222022.so|d06cefc212bfd9d0f2bae801f572ef8ffff2f2fa
-product/lib64/libSuperSensorProcessorCWrapper_v4.so|09160e650e53c436292040abacbe14b88ed07e57
-product/lib64/libSuperSensorProcessor_v11222022.so|7b1310e096de48430197888bf937d9bd56c61e99
-product/lib64/libSuperSensor_v11222022.so|2f0c3c7aa5c37e675e68e19f21a669fd612b2deb
-product/lib64/libtensorflowlite_gpu_delegate.so|39875974baf3ef53d72f62bead7d0727b0f81394
-product/lib64/libtensorflowlite_jni.so|2d041ba5f55c3b4dec03716310d0e59045b4f293
-product/lib64/libtensorflowlite.so|1b3ec3846fbe0ad4a969ed974941b4c5163abe4e
 
 # Moto Permissions
 product/etc/permissions/com.motorola.camera3.content.ai.xml:vendor/etc/permissions/com.motorola.camera3.content.ai.xml