Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9870726 authored by Jackeagle's avatar Jackeagle
Browse files

Merge branch '1433devices-t-update-firmware' into 'v1-t' 

FP3: Update firmware stack from FP3-6.A.035.5-gms-921df471

See merge request !59
parents cef4079c bc3007cc

BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag 




# Vendor Security Patch Level

VENDOR_SECURITY_PATCH := "2023-12-05"

VENDOR_SECURITY_PATCH := "2025-07-05"





# Wifi

device.mk

+2 −2
Original line number Diff line number Diff line
@@ -262,8 +262,8 @@ PRODUCT_VENDOR_PROPERTIES += ro.hardware.egl=adreno 


# DRM

PRODUCT_PACKAGES += \

    android.hardware.drm@1.4.vendor \

    android.hardware.drm@1.4-service.clearkey

    android.hardware.drm-V1-ndk.vendor \

    android.hardware.drm-service.clearkey



PRODUCT_VENDOR_PROPERTIES += \

    drm.service.enabled=true

lineage_FP3.mk

+2 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ $(call inherit-product, vendor/lineage/config/common_full_phone.mk) 
# Inherit from FP3 device

$(call inherit-product, $(LOCAL_PATH)/device.mk)





PRODUCT_BRAND := Fairphone

PRODUCT_DEVICE := FP3

PRODUCT_MANUFACTURER := Fairphone
@@ -39,7 +38,7 @@ PRODUCT_SYSTEM_DEVICE := FP3 
# userdebug

PRODUCT_BUILD_PROP_OVERRIDES += \

        TARGET_DEVICE=FP3 \

        PRIVATE_BUILD_DESC="FP3-user 13 6.A.023.1-gms-497e9bef release-keys"

        PRIVATE_BUILD_DESC="FP3-user 13 6.A.035.5-gms-921df471 release-keys"



# Set BUILD_FINGERPRINT variable to be picked up by both system and vendor build.prop

BUILD_FINGERPRINT := Fairphone/FP3/FP3:13/6.A.023.1/gms-497e9bef:user/release-keys
 
BUILD_FINGERPRINT := Fairphone/FP3/FP3:13/6.A.035.5/gms-921df471:user/release-keys

proprietary-files.txt

+5 −7
Original line number Diff line number Diff line 
# All unpinned blobs are extracted from FP3-REL-6.A.023.1-gms-497e9bef-user

# All unpinned blobs are extracted from FP3-6.A.035.5-gms-921df471



# System partition
@@ -546,7 +546,7 @@ vendor/bin/garden_app 
vendor/bin/hal_proxy_daemon

vendor/bin/hvdcp_opti

vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti

vendor/bin/hw/android.hardware.drm@1.3-service.widevine

vendor/bin/hw/android.hardware.drm-service.widevine

vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti

vendor/bin/hw/android.hardware.keymaster@3.0-service-qti

vendor/bin/hw/android.hardware.keymaster@4.0-service-qti
@@ -717,7 +717,7 @@ vendor/etc/gpfspath_oem_config.xml 


# etc-init

vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc

vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc

vendor/etc/init/android.hardware.drm-service.widevine.rc

vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc

vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc

vendor/etc/init/cnd.rc
@@ -789,7 +789,7 @@ vendor/etc/seccomp_policy/qti-systemd.policy 
vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy



# etc-vintf manifests

-vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml

-vendor/etc/vintf/manifest/manifest_android.hardware.drm-service.widevine.xml

-vendor/etc/vintf/manifest/vendor.nxp.hardware.nfc@2.0-service.xml

-vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml

-vendor/etc/vintf/manifest/vendor.qti.hardware.servicetracker@1.2-service.xml
@@ -1401,8 +1401,7 @@ vendor/lib/libvpplibrary.so 
vendor/lib/libvqzip.so

vendor/lib/libwms.so

vendor/lib/libwqe.so

vendor/lib/libwvhidl.so

vendor/lib/libwvhidl@1.3.so

vendor/lib/libwvaidl.so

vendor/lib/libxml.so

vendor/lib/libxtadapter.so

vendor/lib/libxtwifi_server_protocol.so
@@ -1802,7 +1801,6 @@ vendor/lib64/libvideoutils.so 
vendor/lib64/libvpplibrary.so

vendor/lib64/libwms.so

vendor/lib64/libwqe.so

vendor/lib64/libwvhidl.so

vendor/lib64/libxml.so

vendor/lib64/libxtadapter.so

vendor/lib64/libxtwifi_server_protocol.so