fixup! e3q: Initial commit

BoardConfig.mk

@@ -176,32 +176,49 @@ TARGET_VENDOR_DLKM_PROP += $(DEVICE_PATH)/vendor_dlkm.prop
 
 # Recovery
 TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
+BOARD_HAS_DOWNLOAD_MODE := true
 BOARD_INCLUDE_RECOVERY_DTBO := true
+BOARD_USES_FULL_RECOVERY_IMAGE := true
+BOARD_RECOVERY_MKBOOTIMG_ARGS := --header_version 2
 TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888
-TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true
 
 # Security patch level
 VENDOR_SECURITY_PATCH := 2024-10-01
 
 # Sepolicy
-include device/qcom/sepolicy_vndr/SEPolicy.mk
+#include device/qcom/sepolicy_vndr/SEPolicy.mk
-include device/lineage/sepolicy/libperfmgr/sepolicy.mk
+#include device/lineage/sepolicy/libperfmgr/sepolicy.mk
-BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor
+#BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private
+#SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private
-SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/public
+#SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/public
 
 # Verified Boot
 BOARD_AVB_ENABLE := true
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3
-BOARD_AVB_RECOVERY_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
+BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true
+
+BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA4096
+BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
+BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 3
+
 BOARD_AVB_RECOVERY_ALGORITHM := SHA256_RSA4096
-BOARD_AVB_RECOVERY_ROLLBACK_INDEX := 1
+BOARD_AVB_RECOVERY_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
+BOARD_AVB_RECOVERY_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
 BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1
-BOARD_AVB_VENDOR_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
+
-BOARD_AVB_VENDOR_BOOT_ALGORITHM := SHA256_RSA4096
+BOARD_AVB_VBMETA_SYSTEM := odm product system system_dlkm system_ext vendor vendor_dlkm
-BOARD_AVB_VENDOR_BOOT_ROLLBACK_INDEX := 1
+BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA4096
-BOARD_AVB_VENDOR_BOOT_ROLLBACK_INDEX_LOCATION := 1
+BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
+BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 2
+
+# Use sha256 hash algorithm for system_dlkm partition
+BOARD_AVB_SYSTEM_DLKM_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256
+BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256
+BOARD_AVB_VENDOR_DLKM_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256
+BOARD_AVB_ODM_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256
 
 # VINTF
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \

modules/modules.include.vendor_ramdisk

@@ -1,120 +1,2 @@
-sec_boot_stat.ko
+qrng_dlkm.ko
-sec_log_buf.ko
+tz_log_dlkm.ko
-sec_arm64_ap_context.ko
-gh_arm_drv.ko
-sched-walt.ko
-qcom_ipc_logging.ko
-qcom-pdc.ko
-phy-qcom-ufs.ko
-phy-qcom-ufs-qmp-v4-pineapple.ko
-phy-qcom-ufs-qrbtc-sdm845.ko
-pinctrl-msm.ko
-pinctrl-pineapple.ko
-pinctrl-cliffs.ko
-pinctrl-volcano.ko
-clk-qcom.ko
-clk-dummy.ko
-gdsc-regulator.ko
-clk-rpmh.ko
-dispcc-pineapple.ko
-gcc-cliffs.ko
-gcc-pineapple.ko
-gcc-volcano.ko
-camcc-cliffs.ko
-camcc-pineapple.ko
-gpucc-pineapple.ko
-videocc-pineapple.ko
-tcsrcc-pineapple.ko
-qcom_aoss.ko
-cmd-db.ko
-crm.ko
-mdt_loader.ko
-qcom_rpmh.ko
-smem.ko
-mem_buf.ko
-mem_buf_dev.ko
-mem_buf_msgq.ko
-secure_buffer.ko
-socinfo.ko
-dcc_v2.ko
-qcom_wdt_core.ko
-memory_dump_v2.ko
-qcom_cpu_vendor_hooks.ko
-crypto-qti.ko
-hwkm.ko
-tmecom-intf.ko
-gic_intr_routing.ko
-minidump.ko
-gh_cpusys_vm_mem_access.ko
-qcom-pmu-lib.ko
-dcvs_fp.ko
-qcom-dcvs.ko
-qcom_scmi_client.ko
-qcom_cpucp.ko
-debug_symbol.ko
-proxy-consumer.ko
-rpmh-regulator.ko
-stub-regulator.ko
-debug-regulator.ko
-arm_smmu.ko
-msm_dma_iommu_mapping.ko
-qcom_iommu_util.ko
-iommu-logger.ko
-qti-regmap-debugfs.ko
-qcom-spmi-pmic.ko
-qcom_dma_heaps.ko
-spmi-pmic-arb.ko
-rtc-pm8xxx.ko
-i2c-gpio.ko
-qcom-dload-mode.ko
-qcom-reboot-reason.ko
-qcom_tsens.ko
-thermal_pause.ko
-bcl_pmic5.ko
-cpu_hotplug.ko
-thermal_minidump.ko
-softdog.ko
-qcom-cpufreq-hw.ko
-cqhci.ko
-ufs_qcom.ko
-ufshcd-crypto-qti.ko
-qcom_scmi_vendor.ko
-qcom-scm.ko
-qcom-ipcc.ko
-msm_qmp.ko
-qcom_hwspinlock.ko
-gh_virt_wdt.ko
-gh_dbl.ko
-gh_msgq.ko
-gh_rm_drv.ko
-gunyah_loader.ko
-gunyah_qcom.ko
-qcom_llcc_pmu.ko
-nvmem_qcom-spmi-sdam.ko
-icc-bcm-voter.ko
-icc-rpmh.ko
-qnoc-cliffs.ko
-qnoc-volcano.ko
-qnoc-pineapple.ko
-qnoc-qos.ko
-icc-debug.ko
-icc-test.ko
-sec_class.ko
-sec_key_notifier.ko
-sec_param.ko
-sec_qc_debug.ko
-sec_qc_upload_cause.ko
-sec_qc_logger.ko
-sec_qc_summary.ko
-sec_debug.ko
-sec_pmsg.ko
-sec_upload_cause.ko
-sec_crashkey.ko
-sec_crashkey_long.ko
-sec_debug_region.ko
-sec_pm_log.ko
-abc.ko
-qrtr.ko
-qrtr-gunyah.ko
-sec_qc_param.ko
-sec_qc_dbg_partition.ko

modules/modules.load

@@ -166,7 +166,6 @@ sec_qc_hw_param.ko
 sec_qc_rst_exinfo.ko
 sec_reboot_cmd.ko
 sec_rdx_bootdev.ko
-hdm.ko
 sec_panel_notifier_v2.ko
 pmic_class.ko
 usb_typec_manager.ko

modules/modules.load.recovery

@@ -201,8 +201,6 @@ sg.ko
 spi-msm-geni.ko
 spmi-pmic-arb-debug.ko
 smsc.ko
-smsc75xx.ko
-smsc95xx.ko
 msm_sharedmem.ko
 phy-generic.ko
 phy-qcom-emu.ko
@@ -286,7 +284,6 @@ sec_qc_hw_param.ko
 sec_qc_rst_exinfo.ko
 sec_reboot_cmd.ko
 sec_rdx_bootdev.ko
-hdm.ko
 sec_panel_notifier_v2.ko
 pmic_class.ko
 usb_typec_manager.ko
@@ -373,7 +370,6 @@ adsp_factory_module.ko
 snd-usb-audio-qmi.ko
 snd-soc-cirrus-amp.ko
 snd-soc-cs35l43-i2c.ko
-snd-soc-cs35l45-i2c.ko
 snd-soc-hdmi-codec.ko
 snd-soc-wm-adsp.ko
 snd-soc-cs40l26.ko

product.prop

@@ -52,10 +52,8 @@ ro.com.google.cdb.spa1=bsxasm1
 ro.com.google.clientidbase=android-samsung-ss
 ro.com.google.clientidbase.tx=android-samsung-rvod2
 ro.com.google.gmsversion=14_202406
-ro.dalvik.vm.enable_uffd_gc=true
 ro.frp.pst=/dev/block/persistent
 ro.opa.eligible_device=true
-ro.product.cpu.pagesize.max=4096
 ro.setupwizard.mode=OPTIONAL
 ro.setupwizard.rotation_locked=false
 ro.setupwizard.wifi_on_exit=false
@@ -63,5 +61,4 @@ setupwizard.feature.enable_quick_start_flow=true
 setupwizard.feature.enable_stencil_partner_customization=1
 setupwizard.feature.support_oem_large_screen_landscape_temporary_by_sys_prop=true
 setupwizard.phenotype_sync_timeout_ms=90000
-setupwizard.theme=glif_v3_light
 

proprietary-files.txt

@@ -47,18 +47,19 @@ vendor/lib64/hw/android.hardware.audio@6.0-impl.so
 vendor/lib64/hw/android.hardware.audio@7.0-impl.so
 vendor/lib64/hw/android.hardware.audio@7.1-impl.so
 vendor/lib64/hw/audio.primary.default.so
+vendor/lib64/hw/audio.primary.pineapple.so
 vendor/lib64/hw/audio.r_submix.default.so
 vendor/lib64/hw/audio.usb.default.so
 vendor/lib64/libPeripheralStateUtils.so
 vendor/lib64/lib_SamsungRec_08020.so
 vendor/lib64/lib_lvacfs.so
-vendor/lib64/libagm.so
+-vendor/lib64/libagm.so
 vendor/lib64/libagmclient.so
 vendor/lib64/libalsautils.so
 vendor/lib64/libar-acdb.so
 vendor/lib64/libar-gpr.so
 vendor/lib64/libar-gsl.so
-vendor/lib64/libar-pal.so
+-vendor/lib64/libar-pal.so
 vendor/lib64/libarmemlog.so
 vendor/lib64/libats.so
 vendor/lib64/libaudio_log_utils.so
@@ -83,7 +84,8 @@ vendor/lib64/libsecaudiolevel.so
 vendor/lib64/libsecnativefeature.so
 vendor/lib64/libspeakercalibration.so
 vendor/lib64/libvui_intf.so
-vendor/lib64/vendor.qti.hardware.AGMIPC@1.0-impl.so
+vendor/lib64/vendor.qti.hardware.AGMIPC@1.0.so
+-vendor/lib64/vendor.qti.hardware.AGMIPC@1.0-impl.so
 vendor/lib64/vendor.qti.hardware.pal@1.0-impl.so
 vendor/lib64/vendor.qti.hardware.pal@1.0.so
 
@@ -1891,8 +1893,6 @@ vendor/etc/vintf/manifest/vendor.samsung.hardware.tlc.ucm-manifest.xml
 vendor/etc/vintf/manifest/vendor.samsung.hardware.uwb@1.0-service.xml
 vendor/etc/vintf/manifest/vendor.samsung.hardware.vibrator-default.xml
 vendor/etc/vintf/manifest/vendor.samsung.hardware.wifi-service.xml
-vendor/etc/vintf/manifest_cliffs.xml
-vendor/etc/vintf/manifest_pineapple.xml
 vendor/etc/DsgpPolicy.csv
 vendor/etc/Hapticsconfig.xml
 vendor/etc/IPACM_Filter_cfg.xml

rootdir/etc/fstab.qcom

@@ -1,16 +1,49 @@
-system                                                    /system                    erofs     ro              avb=vbmeta_system,wait,logical,first_stage_mount,avb_keys=/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey:/avb/t-gsi.avbpubkey:/avb/u-gsi.avbpubkey
+# Copyright (c)  2019-2023 The Linux Foundation. All rights reserved.
-system                                                    /system                    f2fs      ro              avb=vbmeta_system,wait,logical,first_stage_mount,avb_keys=/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey:/avb/t-gsi.avbpubkey:/avb/u-gsi.avbpubkey
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted (subject to the limitations in the
+# disclaimer below) provided that the following conditions are met:
+#
+#    * Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+#
+#    * Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials provided
+#      with the distribution.
+#
+#    * Neither the name of The Linux Foundation nor the names of its
+#      contributors may be used to endorse or promote products derived
+#      from this software without specific prior written permission.
+#
+# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Android fstab file.
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+#<src>                                                 <mnt_point>            <type>  <mnt_flags and options>                            <fs_mgr_flags>
 system                                                  /system                ext4    ro                                                 avb=vbmeta_system,wait,logical,first_stage_mount,avb_keys=/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey:/avb/t-gsi.avbpubkey:/avb/u-gsi.avbpubkey
-system_ext                                                /system_ext                erofs     ro              avb=vbmeta_system,wait,logical,first_stage_mount,avb_keys=/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey:/avb/t-gsi.avbpubkey:/avb/u-gsi.avbpubkey
+system_ext                                              /system_ext            ext4    ro                                                 avb=vbmeta_system,wait,logical,first_stage_mount,avb_keys=/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey:/avb/t-gsi.avbpubkey:/avb/u-gsi.avbpubkey
-product                                                   /product                   erofs     ro              avb,wait,logical,first_stage_mount
+product                                                 /product               ext4    ro                                                 avb,wait,logical,first_stage_mount
-vendor                                                    /vendor                    erofs     ro              avb,wait,logical,first_stage_mount
+vendor                                                  /vendor                ext4    ro                                                 avb,wait,logical,first_stage_mount
-vendor_dlkm                                               /vendor_dlkm               erofs     ro              avb,wait,logical,first_stage_mount
+vendor_dlkm                                             /vendor_dlkm           ext4    ro                                                 avb,wait,logical,first_stage_mount
-system_dlkm                                               /system_dlkm               erofs     ro              avb,wait,logical,first_stage_mount
-system_dlkm                                               /system_dlkm               f2fs      ro              avb,wait,logical,first_stage_mount
 system_dlkm                                             /system_dlkm           ext4    ro                                                 avb,wait,logical,first_stage_mount
-odm                                                       /odm                       erofs     ro              avb,wait,logical,first_stage_mount
+odm                                                     /odm                   ext4    ro                                                 avb,wait,logical,first_stage_mount
 /dev/block/by-name/metadata                             /metadata              f2fs    noatime,nosuid,nodev,discard,sync,fsync_mode=strict,data_flush    wait,check,formattable,wrappedkey,first_stage_mount
-/dev/block/bootdevice/by-name/userdata                    /data                      f2fs      noatime,nosuid,nodev,discard,usrquota,grpquota,fsync_mode=nobarrier,reserve_root=32768,resgid=5678,inlinecrypt     latemount,wait,check,,quota,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs,fscompress,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,metadata_encryption=aes-256-xts:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption
+/dev/block/bootdevice/by-name/userdata                  /data                  f2fs    noatime,nosuid,nodev,discard,usrquota,grpquota,fsync_mode=nobarrier,reserve_root=32768,resgid=5678,inlinecrypt    latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,metadata_encryption=aes-256-xts:wrappedkey_v0,quota,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs,fscompress
 /dev/block/bootdevice/by-name/cache                     /cache                 ext4    noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic      wait,check
 /dev/block/bootdevice/by-name/persist                   /mnt/vendor/persist    ext4    noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic      wait,check
 /dev/block/bootdevice/by-name/misc                      /misc                  emmc    defaults                                           defaults,first_stage_mount
@@ -22,7 +55,7 @@ odm                                                       /odm
 /dev/block/bootdevice/by-name/vendor_boot               /vendor_boot           emmc    defaults                                           defaults,first_stage_mount
 /dev/block/bootdevice/by-name/init_boot                 /init_boot             emmc    defaults                                           defaults,first_stage_mount
 /dev/block/bootdevice/by-name/vm-bootsys                /product/vm-system     ext4    ro,nosuid,nodev,barrier=1                          defaults
-/dev/block/platform/soc/1d84000.ufshc/by-name/prism       /prism                     ext4      ro,barrier=1             avb,nofail,first_stage_mount
+
-/dev/block/platform/soc/1d84000.ufshc/by-name/optics      /optics                    ext4      ro,barrier=1             avb,nofail,first_stage_mount
+#VOLD
 /devices/platform/soc/*.ssusb/*.dwc3/xhci-hcd.*.auto*   auto                   vfat    default                                            voldmanaged=usb:auto
 /devices/platform/soc/8804000.sdhci/mmc_host*           auto                   auto    default                                            voldmanaged=sdcard:auto

system.prop

@@ -158,17 +158,11 @@ pm.dexopt.shared=speed
 qcom.hw.aac.encoder=true
 qemu.hw.mainkeys=0
 ro.actionable_compatible_property.enabled=true
-ro.allow.mock.location=0
-ro.binary.type=user
 ro.build.2ndbrand=false
-ro.build.PDA=S928BXXS3AXI8
 ro.build.changelist=29543898
 ro.build.display_build_number=true
 ro.build.official.developer=false
 ro.build.official.release=true
-ro.build.selinux=1
-ro.build.version.oneui=60101
-ro.build.version.security_index=1
 ro.build.version.sem=3402
 ro.build.version.sep=150500
 ro.camerax.extensions.enabled=true