exynos9610: Squashed inclusion of MotCamera2

This is a squashed commit of:

Add Moto Camera 2 & priv-app permissions
* Snap APIv2 doesn't support our Aux Cam, or Camera
  Mods (considering they are removable and need special
  HAL handling for flash, internal Camera/USB disabling,
  etc.

* Snap APIv1 doesn't like our front-flash, or video
  recording audio (likely fixable). As well as the
  aforementioned lack of Camera Mod support.

* Mata ships Klik to support an external Camera "mod"
  and sets precedent for shipping OEM Cameras, so we're
  just going to go ahead and do it.

Change-Id: I7d5001e7f743cdb9aaeb70c032a19cc008209135 | AOSP
---------------------------------------------------------

Include MotoSignatureApp
* Needed for MotCamera2 to update via the Play Store.
* Also exclude from dex-opt'ing on host, as this app
  is known not to like that (see: shamu, clark).

Change-Id: Ibf2aafd731783fdae63b228460753457296de47c | AOSP
----------------------------------------------------------

Override Camera2 with MotCamera2 properly
* Possible as of https://review.lineageos.org/c/LineageOS/android_tools_extract-utils/+/314698.

Change-Id: I88808f7ab795099dc0ea1e80992d7c68aaa90167 | AOSP
---------------------------------------------------------

Change-Id: I89aa823bac2a2fa4b92d324cc0dbcdc6811468de

diff --git a/common.mk b/common.mk
index 245e4278dec234750046cbb5a5f338fa581a306a..e863d8c480297fa6260884b9104ef4c7391af788 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -89,6 +89,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.configstore@1.1-service
 
+# Dex-pre-opt exclusions
+$(call add-product-dex-preopt-module-config,MotoSignatureApp,disable)
+
 # Display
 PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-impl \

diff --git a/extract-files.sh b/extract-files.sh
index 24869b77c5da8e15aa8a9834a4125c33abaeb9ff..56576446db91c8060e2b6463e15b0a052e4bdd0b 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -77,6 +77,8 @@ for LIBDEMANGLE64 in $(grep -L "libdemangle.so" "${BLOB_ROOT}"/vendor/lib64/libh
     "${PATCHELF}" --add-needed "libdemangle.so" "${LIBDEMANGLE64}"
 done
 
+sed -i 's|/system/framework|/vendor/framework|' "${BLOB_ROOT}"/vendor/etc/permissions/com.motorola.motosignature.xml
+
 # Remove libhidltransport dependency
 "${PATCHELF}" --remove-needed "libhidltransport.so" "${BLOB_ROOT}"/vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-rbs
 "${PATCHELF}" --remove-needed "libhidltransport.so" "${BLOB_ROOT}"/vendor/lib64/hw/android.hardware.gnss@1.0-impl.samsung.so

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 015438a63538dc256222c25b6d60e542d45b4cc6..0d3120070ea9e8a61772a770342c6eb7bf10f819 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -4,6 +4,62 @@
 lib64/libaptXHD_encoder.so
 lib64/libaptX_encoder.so
 
+## Camera
+-app/MotoSignatureApp/MotoSignatureApp.apk;PRESIGNED
+etc/permissions/com.motorola.motosignature.xml:vendor/etc/permissions/com.motorola.motosignature.xml
+framework/com.motorola.motosignature.jar:vendor/framework/com.motorola.motosignature.jar
+product/etc/permissions/privapp-permissions-com.motorola.camera2.xml
+-product/app/MotCamera2AI/MotCamera2AI.apk
+product/etc/permissions/com.motorola.camera2.content.ai.xml
+product/etc/permissions/deviceowner-configuration-com.motorola.camera2.xml
+product/etc/permissions/com.motorola.camera2.hallasan.xml
+product/etc/permissions/privapp-permissions-com.motorola.camera2.xml
+product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera2.xml
+-product/priv-app/MotCamera2/MotCamera2.apk;OVERRIDES=Camera2|372f8942f990edb14261a01b090d55aaac2ce6a7
+
+## Camera - MotCamera2 - libs
+product/lib64/libFNVfbEngineHAL.so|8d6a887566576d65dd4b902bbec17d05463a0ccb
+product/lib64/libaicamera.so|b66203df7220bcf20bbf692ce169db956fb045f7
+product/lib64/libarcsoft_dualcam_refocus_hallasan.so|45b698d11fd7df2727be0848be10dd4292e34257
+product/lib64/libarcsoft_supernight.so|67fc89e4bc6dbf71e8beaf238b9e342c91142d99
+product/lib64/libbg-postproc-jni.so|f934baa28aa4ade4837a5c1576e31f9888bc44ae
+product/lib64/libbs-depth.so|1758830d6614361651c9952b80ce2d7c9b917cb9
+product/lib64/libcamerax_extension_jni.so|1026bac4d48752c9dae6d349c1eb2e35f205365a
+product/lib64/libfn-beauty-vfb-ASIA.so|aea0e9e777fb21f4414c54ee3591b85277eb883e
+product/lib64/libfn-beauty-vfb-LATAM.so|53b8b2a7b456db6ffaa23265b3bbb735dc35e82b
+product/lib64/libfn-beauty-vfb-US.so|9540cdc03282f79c78b7e53646121861006f4711
+product/lib64/libfn-beauty-vfb-kane_ASIA.so|fb3608807bc89d1270758c35af92045e994edf9b
+product/lib64/libfn-beauty-vfb-kane_LATAM.so|24780c77ea7243414974f8fa5381b42b730092e1
+product/lib64/libfn-beauty-vfb-kane_US.so|24780c77ea7243414974f8fa5381b42b730092e1
+product/lib64/libfoundation.so|3dd7eebbc98db5b1917fc395bacba2ed3ba8da68
+product/lib64/libgg-tensorflow-lite.so|60656409fc49478f2ab0576f9012e8c3adb48914
+product/lib64/libgif.so|310d708f0c9b60c065514c1e3f1534c8ba347c7d
+product/lib64/libjpeg.so|a51f6dde2a6d7eb11378a2575a5e6bf625a15bbb
+product/lib64/liblenovo_panorama.so|b88e00a55966c06fa3450ae3d3ba27398029c8d6
+product/lib64/libmcf-base.so|6c32f49ab21c47cb221df4bb1a7e50b6cb95ea85
+product/lib64/libmcf-jni.so|b33dde5b34f9b5ef597032709f2f2ef9e1a67b1c
+product/lib64/libmegface.so|3da392e0099fd13481d31f490089a8113fe9d6d9
+product/lib64/libmorpho_cinema_graph.so|c538e653a5e718ae43f52005e3351276d6cd13c5
+product/lib64/libmorpho_defocusface.so|3b58c47696e358f5af252e7fee696c4bd7babc1c
+product/lib64/libmorpho_easy_hdr.so|2f9b5fcc74a022d492fc20fc09b5cb3fec2ba0e4
+product/lib64/libmorpho_image_stab5.so|67244032b85194c009b89c220cb1980bd15c3f51
+product/lib64/libmorpho_panorama_gp3.so|8da064fb1ac5a4bb5205a67ee63efea6872221b9
+product/lib64/libmorpho_sensor_fusion.so|0d48902b404b509ef04ee648a04c83fbc24ee304
+product/lib64/libmorpho_super_resolution.so|5b9632a55df2709a841cf5034af1704d85d970cf
+product/lib64/libmot-cinemagraph-engine.so|3e3211c6ced4638e6d098161a9bfd1d5f6e8cec5
+product/lib64/libmot-remosaic-util.so|4d7b0c1dbaf1d63ab42ba52977488e45c1f6c26a
+product/lib64/libmot-util.so|22b03ab6e7babfefc720bfa2f33481d9f513ba3c
+product/lib64/libmp-dis-v4.so|2e5fdd81852dff0998a4fb9b1d86756fad85c71c
+product/lib64/libmp-dis-v5.so|1938006f38ba8f58126372c6cd960d45f3d3e420
+product/lib64/libmpbase.so|07021c39abbc5c8538f6df1876a3eb3015ff9c2a
+product/lib64/libnnp.so|2999312040ee9a23c8d970e1dd5d271148afdf26
+product/lib64/libqc-clearsight.so|2a3838ad177668f5102ebab1fc5c7153ab2b2f5b
+product/lib64/libqc-depth.so|9ef198fd1a7f773e00c40356fb1bbd2d25e3df08
+product/lib64/libqc-focus.so|20326499dec3e0ee850a40b154de99ffeba6f5ac
+product/lib64/libqc-snpe.so|d95fffe229b315a52694f186a75086180e522861
+product/lib64/libtscv.so|9695cc7f6b7d7b8baf56a769a7bcaee68dd89d58
+product/lib64/libzxing-core.so|18b1f6ca0a0864f6fe62193fa4779d581b8e5e28
+
 ## HotwordEnrollment
 -product/priv-app/HotwordEnrollmentOKGoogleWM8280/HotwordEnrollmentOKGoogleWM8280.apk
 -product/priv-app/HotwordEnrollmentXGoogleWM8280/HotwordEnrollmentXGoogleWM8280.apk