dubai: Update from S1RDS32M.55-94-2

Also remove duplicate cvp blobs which are in sm7325-common tree and Update
MotCamera4 and disable Video HDR and Night Vision. We can also leave the
required libs in the apk now that we are on lineage-20.

Change-Id: I39bd9e5daacdc525091b9391aa3a968ce10e0144
This commit is contained in:
Marc Bourgoin 2022-12-22 19:50:40 -07:00
parent c3afbb1902
commit 0c983e1394
3 changed files with 14 additions and 16 deletions

View file

@ -58,7 +58,7 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90
# Security # Security
VENDOR_SECURITY_PATCH := 2022-10-01 VENDOR_SECURITY_PATCH := 2022-12-01
# inherit from the proprietary version # inherit from the proprietary version
include vendor/motorola/dubai/BoardConfigVendor.mk include vendor/motorola/dubai/BoardConfigVendor.mk

View file

@ -34,6 +34,6 @@ PRODUCT_GMS_CLIENTID_BASE := android-motorola
PRODUCT_BUILD_PROP_OVERRIDES += \ PRODUCT_BUILD_PROP_OVERRIDES += \
TARGET_PRODUCT=dubai_g \ TARGET_PRODUCT=dubai_g \
PRIVATE_BUILD_DESC="dubai_g-user 12 S1RD32M.55-94 9be6b release-keys" PRIVATE_BUILD_DESC="dubai_g-user 12 S1RD32M.55-94-2 25a783 release-keys"
BUILD_FINGERPRINT := motorola/dubai_g/dubai:12/S1RD32M.55-94/9be6b:user/release-keys BUILD_FINGERPRINT := motorola/dubai_g/dubai:12/S1RDS32M.55-94-2/25a783:user/release-keys

View file

@ -1,4 +1,4 @@
# All unpinned blobs below are extracted from 12-S1RD32M.55-94 9be6b release-keys. # All unpinned blobs below are extracted from dubai_g-user 12 S1RD32M.55-94-2 25a783 release-keys.
# ACDB Data # ACDB Data
vendor/etc/acdbdata/nn_ns_models/candidate__2.7.1.31__3.0.0__eai_1.10_enpu1.pmd vendor/etc/acdbdata/nn_ns_models/candidate__2.7.1.31__3.0.0__eai_1.10_enpu1.pmd
@ -28,8 +28,6 @@ vendor/lib/libacdbloader.so
vendor/lib64/libacdbloader.so vendor/lib64/libacdbloader.so
# Camera # Camera
vendor/etc/cvp/v2.0/facedetection/model1.dat
vendor/etc/cvp/v2.1/facedetection/model2.dat
vendor/etc/pwr/PowerFeatureConfig.xml vendor/etc/pwr/PowerFeatureConfig.xml
vendor/etc/pwr/VideoPowerOptFeature.xml vendor/etc/pwr/VideoPowerOptFeature.xml
vendor/lib/camera/fdconfigpreview.bin vendor/lib/camera/fdconfigpreview.bin
@ -486,21 +484,12 @@ vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so
# MotCamera4 # MotCamera4
-product/app/MotCamera3AI/MotCamera3AI.apk;PRESIGNED -product/app/MotCamera3AI/MotCamera3AI.apk;PRESIGNED
product/etc/init/init.motcamera3.lens.rc product/etc/init/init.motcamera3.lens.rc
-product/priv-app/MotCamera4/MotCamera4.apk;OVERRIDES=Aperture|4abdf15db1dc226206423f230c956dad8754b96c -product/priv-app/MotCamera4/MotCamera4.apk;OVERRIDES=Aperture|f33ba5f0f8542fd6693cb2c7ed4faaf1449795fe
system_ext/etc/public.libraries-motocamera.txt system_ext/etc/public.libraries-motocamera.txt
system_ext/framework/com.motorola.androidx.camera.extensions.jar system_ext/framework/com.motorola.androidx.camera.extensions.jar
system_ext/lib/libmcf_native_window_helper.motocamera.so system_ext/lib/libmcf_native_window_helper.motocamera.so
system_ext/lib64/libmcf_native_window_helper.motocamera.so system_ext/lib64/libmcf_native_window_helper.motocamera.so
# MotCamera4 - Permissions
product/etc/permissions/com.motorola.camera3.content.ai.xml
product/etc/permissions/com.motorola.camera3.lens.xml
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
system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml
# MotCamera4 - Libs # MotCamera4 - Libs
product/lib64/libFNVfbEngineHAL.so|a7365d9e7d728df8d4ad6ecfba07961fcf924d75 product/lib64/libFNVfbEngineHAL.so|a7365d9e7d728df8d4ad6ecfba07961fcf924d75
product/lib64/libNvBeautyEffect.so|cd80f5049b2f668379f1d3ecbf6e6206de20a46d product/lib64/libNvBeautyEffect.so|cd80f5049b2f668379f1d3ecbf6e6206de20a46d
@ -555,6 +544,15 @@ product/lib64/libsmudge_detect.so|915e44b5013096b846b87c539d92200a0b048d23
product/lib64/libtensorflowlite.so|17f94dc427220788db8f10d658d3a330488ac7d6 product/lib64/libtensorflowlite.so|17f94dc427220788db8f10d658d3a330488ac7d6
product/lib64/libtensorflowlite_gpu_delegate.so|821bcbece27d47c49daac00a65fdf48213befad1 product/lib64/libtensorflowlite_gpu_delegate.so|821bcbece27d47c49daac00a65fdf48213befad1
# MotCamera4 - Permissions
product/etc/permissions/com.motorola.camera3.content.ai.xml
product/etc/permissions/com.motorola.camera3.lens.xml
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
system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml
# NFC # NFC
vendor/bin/STFlashTool vendor/bin/STFlashTool