From f41f88aa269aa0494726f791001b1b02f237ca88 Mon Sep 17 00:00:00 2001 From: SaschaNes Date: Thu, 7 Aug 2025 07:32:07 +0200 Subject: [PATCH] man...dont ask --- BoardConfig.mk | 17 +- configs/vintf/device_framework_matrix.xml | 68 +++++ configs/vintf/manifest.xml | 157 +++++++++++- configs/vintf/manifest_pineapple.xml | 296 ---------------------- device.mk | 44 ++-- 5 files changed, 253 insertions(+), 329 deletions(-) delete mode 100644 configs/vintf/manifest_pineapple.xml diff --git a/BoardConfig.mk b/BoardConfig.mk index a068149..797c165 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -39,6 +39,8 @@ BOARD_SUPPORTS_OPENSOURCE_STHAL := true BOARD_SUPPORTS_SOUND_TRIGGER := true BOARD_USES_ALSA_AUDIO := true TARGET_PROVIDES_AUDIO_HAL := true +TARGET_PROVIDES_LIBAGM := true +TARGET_PROVIDES_LIBAR_PAL := true TARGET_USES_QCOM_MM_AUDIO := true # Board @@ -79,8 +81,8 @@ BOARD_KERNEL_CMDLINE := \ androidboot.hardware=qcom \ androidboot.memcg=1 \ androidboot.usbcontroller=a600000.dwc3 \ - # androidboot.load_modules_parallel=false \ - # androidboot.hypervisor.protected_vm.supported=true \ + androidboot.load_modules_parallel=false \ + androidboot.hypervisor.protected_vm.supported=true \ androidboot.selinux=permissive \ # aosp_is_booting \ firmware_class.path=/vendor/firmware_mnt/image \ @@ -104,8 +106,8 @@ BOARD_USES_GENERIC_KERNEL_IMAGE := true TARGET_KERNEL_SOURCE := kernel/samsung/sm8650 TARGET_KERNEL_CONFIG := \ gki_defconfig \ - vendor/pineapple_GKI.config \ - oem/e3q-lego.config + vendor/pineapple_GKI.config + # oem/e3q-lego.config # Kernel modules BOARD_SYSTEM_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.system_dlkm)) @@ -158,6 +160,7 @@ BOARD_USES_METADATA_PARTITION := true # Partitions BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64) +-include vendor/lineage/config/BoardConfigReservedSize.mk BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296 BOARD_CACHEIMAGE_PARTITION_SIZE := 367001600 BOARD_DTBOIMG_PARTITION_SIZE := 16777216 @@ -223,7 +226,8 @@ TARGET_USERIMAGES_USE_F2FS := true TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH) # Security patch level -VENDOR_SECURITY_PATCH := 2024-10-01 +VENDOR_SECURITY_PATCH := 2025-07-01 +VENDOR_SECURITY_PATCH := $(BOOT_SECURITY_PATCH) # SEPolicy include device/qcom/sepolicy_vndr/SEPolicy.mk @@ -272,8 +276,7 @@ DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml DEVICE_MANIFEST_FILE := \ hardware/qcom-caf/sm8650/audio/primary-hal/configs/common/manifest_non_qmaa.xml \ hardware/qcom-caf/sm8650/audio/primary-hal/configs/common/manifest_non_qmaa_extn.xml \ - $(DEVICE_PATH)/configs/vintf/manifest.xml \ - $(DEVICE_PATH)/configs/vintf/manifest_pineapple.xml \ + $(DEVICE_PATH)/configs/vintf/manifest.xml # Wi-Fi BOARD_WLAN_DEVICE := qcwcn diff --git a/configs/vintf/device_framework_matrix.xml b/configs/vintf/device_framework_matrix.xml index 7540082..3852096 100644 --- a/configs/vintf/device_framework_matrix.xml +++ b/configs/vintf/device_framework_matrix.xml @@ -1,4 +1,12 @@ + + vendor.samsung.hardware.audio + 1 + + ISecAudioHal + default + + vendor.samsung.hardware.authfw @@ -195,4 +203,64 @@ default + + android.frameworks.sensorservice + 1.0 + + ISensorManager + default + + + + android.hidl.allocator + 1.0 + + IAllocator + ashmem + + + + android.hidl.manager + 1.0 + + IServiceManager + default + + + + android.hidl.memory + 1.0 + + IMapper + ashmem + + + + android.hidl.token + 1.0 + + ITokenManager + default + + + + vendor.qti.hardware.qccsyshal + 1.0-2 + + IQccsyshal + qccsyshal + + + + vendor.qti.hardware.sigma_miracast + 1.0 + + Isigma_miracast + sigmahal + sigmahal64 + + + + 35 + diff --git a/configs/vintf/manifest.xml b/configs/vintf/manifest.xml index ea244e9..30af3d2 100644 --- a/configs/vintf/manifest.xml +++ b/configs/vintf/manifest.xml @@ -1,16 +1,159 @@ - + + + android.hardware.audio + hwbinder + @7.1::IDevicesFactory/default + + + android.hardware.audio.effect + hwbinder + @7.0::IEffectsFactory/default + + + android.hardware.bluetooth + hwbinder + @1.1::IBluetoothHci/default + + android.hardware.gatekeeper + IGatekeeper/default + + + android.hardware.security.keymint + 3 + IKeyMintDevice/strongbox + + + android.hardware.security.keymint + 3 + IKeyMintDevice/default + + + android.hardware.security.keymint + 3 + IRemotelyProvisionedComponent/default + + + android.hardware.security.secureclock + ISecureClock/default + + + android.hardware.security.sharedsecret + ISharedSecret/default + + + android.hardware.weaver + 2 + IWeaver/default + + + com.dsi.ant + hwbinder + @1.0::IAnt/default + + + com.qualcomm.qti.dpm.api + hwbinder + @1.0::IdpmQmi/dpmQmiService + + + com.qualcomm.qti.imscmservice + hwbinder + @2.2::IImsCmService/qti.ims.connectionmanagerservice + + + com.qualcomm.qti.uceservice + hwbinder + @2.3::IUceService/com.qualcomm.qti.uceservice + + + vendor.qti.hardware.bluetooth_audio + hwbinder + @2.1::IBluetoothAudioProvidersFactory/default + + + vendor.qti.hardware.bluetooth_sar + hwbinder + @1.1::IBluetoothSar/default + + + vendor.qti.hardware.btconfigstore + hwbinder + @2.0::IBTConfigStore/default + + + vendor.qti.hardware.cacert + hwbinder + @1.0::IService/default + + + vendor.qti.hardware.capabilityconfigstore + hwbinder + @1.0::ICapabilityConfigStore/default + + + vendor.qti.hardware.dsp + hwbinder + @1.0::IDspService/dspservice + + + vendor.qti.hardware.factory + hwbinder + @1.1::IFactory/default + + + vendor.qti.hardware.fm + hwbinder + @1.0::IFmHci/default + + + vendor.qti.hardware.secureprocessor.device + hwbinder + @1.0::ISecureProcessor/qti-tee + @1.0::ISecureProcessor/qti-tvm + + + vendor.qti.hardware.spu + 2 + ISPUManager/default + + + vendor.qti.hardware.wifi.wifilearner + hwbinder + @1.0::IWifiStats/wifiStats + + + vendor.qti.ims.callinfo + hwbinder + @1.0::IService/default + + + vendor.qti.ims.factory + hwbinder + @1.1::IImsFactory/default + + + vendor.qti.spu + hwbinder + @1.1::ISPUManager/default + + + vendor.qti.spu + hwbinder + @2.0::ISPUManager/default + + vendor.samsung.hardware.keymint 3 ISehKeyMintExtension/default - - - vendor.samsung.hardware.keymint - 3 ISehKeyMintFactory/default + + 202404 + diff --git a/configs/vintf/manifest_pineapple.xml b/configs/vintf/manifest_pineapple.xml deleted file mode 100644 index 0d8c7bf..0000000 --- a/configs/vintf/manifest_pineapple.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - vendor.qti.hardware.capabilityconfigstore - hwbinder - 1.0 - - ICapabilityConfigStore - default - - - - android.hardware.audio - hwbinder - @7.1::IDevicesFactory/default - - - android.hardware.audio.effect - hwbinder - 7.0 - - IEffectsFactory - default - - - - - vendor.qti.hardware.dsp - hwbinder - 1.0 - - IDspService - dspservice - - - - android.hardware.gatekeeper - 1 - - IGatekeeper - default - - - - - - - android.hardware.secure_element - 1 - ISecureElement/eSE1 - - - - com.qualcomm.qti.dpm.api - hwbinder - 1.0 - - IdpmQmi - dpmQmiService - - - - - - com.qualcomm.qti.uceservice - hwbinder - 2.3 - - IUceService - com.qualcomm.qti.uceservice - - - - - vendor.qti.ims.callinfo - hwbinder - 1.0 - - IService - default - - - - - com.qualcomm.qti.imscmservice - hwbinder - 2.2 - - IImsCmService - qti.ims.connectionmanagerservice - - - - vendor.qti.ims.factory - hwbinder - 1.1 - - IImsFactory - default - - - - vendor.qti.hardware.cacert - hwbinder - 1.0 - - IService - default - - - - - vendor.qti.hardware.factory - hwbinder - 1.1 - - IFactory - default - - - - - vendor.qti.hardware.secureprocessor.device - hwbinder - 1.0 - - ISecureProcessor - qti-tee - qti-tvm - - - - - android.hardware.bluetooth - hwbinder - 1.1 - - IBluetoothHci - default - - - - vendor.qti.hardware.bluetooth_audio - hwbinder - 2.1 - - IBluetoothAudioProvidersFactory - default - - - - vendor.qti.hardware.btconfigstore - hwbinder - 2.0 - - IBTConfigStore - default - - - - - vendor.qti.hardware.fm - hwbinder - 1.0 - - IFmHci - default - - - - - com.dsi.ant - hwbinder - 1.0 - - IAnt - default - - - - - - vendor.qti.hardware.wifi.wifilearner - hwbinder - 1.0 - - IWifiStats - wifiStats - - - - - vendor.qti.hardware.bluetooth_sar - hwbinder - 1.1 - - IBluetoothSar - default - - - - - vendor.qti.spu - hwbinder - 1.1 - - ISPUManager - default - - - - vendor.qti.spu - hwbinder - 2.0 - - ISPUManager - default - - - - vendor.qti.hardware.spu - 2 - - ISPUManager - default - - - - android.hardware.security.keymint - 3 - IKeyMintDevice/default - IKeyMintDevice/strongbox - - - android.hardware.security.keymint - 3 - IRemotelyProvisionedComponent/default - - - android.hardware.security.secureclock - ISecureClock/default - - - android.hardware.security.sharedsecret - ISharedSecret/default - - - android.hardware.weaver - 2 - - IWeaver - default - - - diff --git a/device.mk b/device.mk index 4fdfee1..d77bed6 100644 --- a/device.mk +++ b/device.mk @@ -26,15 +26,6 @@ PRODUCT_AAPT_PREF_CONFIG := xxxhdpi BOARD_SHIPPING_API_LEVEL := 34 PRODUCT_SHIPPING_API_LEVEL := $(BOARD_SHIPPING_API_LEVEL) -ifeq ($(TARGET_BUILD_VARIANT),eng) - PRODUCT_SOONG_DEXPREOPT_ENABLED := true - PRODUCT_SOONG_CONFIG_OVERRIDES += \ - dex_preopt_enabled=true - DISABLE_DEXPREOPT := false - PRODUCT_DEX_PREOPT := true - PRODUCT_ART_BOOT_JARS_PREOPT := true -endif - # No A/B AB_OTA_UPDATER := false @@ -58,7 +49,7 @@ PRODUCT_PACKAGES += \ libagm_mixer_plugin \ libagm_pcm_plugin \ libbatterylistener \ - libpal \ + libpar-pal \ libfmpal \ liblx-osal \ libar-gsl \ @@ -201,8 +192,14 @@ PRODUCT_COPY_FILES += \ # Health PRODUCT_PACKAGES += \ - android.hardware.health-service.qti \ - android.hardware.health-service.qti_recovery + android.hardware.health-service.samsung \ + android.hardware.health-service.samsung-recovery + +# Lineage Health +PRODUCT_PACKAGES += \ + vendor.lineage.health-service.default + +$(call soong_config_set,lineage_health,charging_control_charging_path,/sys/class/power_supply/battery/batt_slate_mode) # HIDL PRODUCT_PACKAGES += \ @@ -250,6 +247,9 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay PRODUCT_ENFORCE_RRO_TARGETS := * +PRODUCT_PACKAGES += \ + FrameworksResCommon + # Power PRODUCT_PACKAGES += \ android.hardware.power-service-qti \ @@ -341,27 +341,27 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/fstab.qcom # Sensors -#PRODUCT_PACKAGES += \ -# android.hardware.sensors-service.samsung-multihal \ -# sensors.dynamic_sensor_hal +PRODUCT_PACKAGES += \ + android.hardware.sensors-service.samsung-multihal \ + sensors.dynamic_sensor_hal PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \ + frameworks/native/data/etc/android.hardware.sensor.ambient_temperature.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.ambient_temperature.xml \ frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.barometer.xml \ frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \ + frameworks/native/data/etc/android.hardware.sensor.dynamic.head_tracker.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.dynamic.head_tracker.xml \ frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \ + frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.hifi_sensors.xml \ frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml \ frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \ + frameworks/native/data/etc/android.hardware.sensor.relative_humidity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.relative_humidity.xml \ frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml \ frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml -# Shim -# PRODUCT_COPY_FILES += \ -# $(LOCAL_PATH)/rootdir/system/bin/app_process32:system/bin/app_process32 - # Soong namespaces PRODUCT_SOONG_NAMESPACES += \ $(LOCAL_PATH) \ @@ -445,5 +445,11 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml +# Wi-Fi firmware symlinks +PRODUCT_PACKAGES += \ + firmware_wlanmdsp.otaupdate_symlink \ + firmware_wlan_mac.bin_symlink \ + firmware_WCNSS_qcom_cfg.ini_symlink + # Inherit the proprietary files $(call inherit-product, vendor/samsung/e3q/e3q-vendor.mk)