diff --git a/Android.bp b/Android.bp index 3b08534..3d935f8 100644 --- a/Android.bp +++ b/Android.bp @@ -6,3 +6,24 @@ soong_namespace { } + +install_symlink { + name: "firmware_wlanmdsp.otaupdate_symlink", + vendor: true, + installed_location: "firmware/wlanmdsp.otaupdate", + symlink_target: "/data/vendor/firmware/wlanmdsp.mbn", +} + +install_symlink { + name: "firmware_wlan_mac.bin_symlink", + vendor: true, + installed_location: "firmware/wlan/qca_cld/kiwi_v2/wlan_mac.bin", + symlink_target: "/mnt/vendor/persist/kiwi_v2/wlan_mac.bin", +} + +install_symlink { + name: "firmware_WCNSS_qcom_cfg.ini_symlink", + vendor: true, + installed_location: "firmware/wlan/qca_cld/kiwi_v2/WCNSS_qcom_cfg.ini", + symlink_target: "/odm/vendor/etc/wifi/WCNSS_qcom_cfg.ini", +} diff --git a/Android.mk b/Android.mk index 2e67096..99eae09 100644 --- a/Android.mk +++ b/Android.mk @@ -8,4 +8,24 @@ LOCAL_PATH := $(call my-dir) ifeq ($(TARGET_DEVICE),e3q) include $(call all-subdir-makefiles,$(LOCAL_PATH)) + +include $(CLEAR_VARS) + +FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware_mnt +$(FIRMWARE_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE) + @echo "Creating $(FIRMWARE_MOUNT_POINT)" + @mkdir -p $(TARGET_OUT_VENDOR)/firmware_mnt + +BT_FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/bt_firmware +$(BT_FIRMWARE_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE) + @echo "Creating $(BT_FIRMWARE_MOUNT_POINT)" + @mkdir -p $(TARGET_OUT_VENDOR)/bt_firmware + +DSP_MOUNT_POINT := $(TARGET_OUT_VENDOR)/dsp +$(DSP_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE) + @echo "Creating $(DSP_MOUNT_POINT)" + @mkdir -p $(TARGET_OUT_VENDOR)/dsp + +ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT) + endif diff --git a/BoardConfig.mk b/BoardConfig.mk index 2ca7efc..30d1b4d 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -12,12 +12,14 @@ DEVICE_PATH := device/samsung/e3q # Architecture TARGET_ARCH := arm64 -TARGET_ARCH_VARIANT := armv8-a +TARGET_ARCH_VARIANT := armv9-a TARGET_CPU_ABI := arm64-v8a -TARGET_CPU_ABI2 := TARGET_CPU_VARIANT := generic TARGET_CPU_VARIANT_RUNTIME := kryo300 +# Assert +TARGET_OTA_ASSERT_DEVICE := e3q + # Board TARGET_BOARD_INFO_FILE := $(DEVICE_PATH)/board-info.txt @@ -28,7 +30,6 @@ BOARD_RAMDISK_USE_LZ4 := true # Bootloader TARGET_BOOTLOADER_BOARD_NAME := pineapple -TARGET_NO_BOOTLOADER := true # Display TARGET_SCREEN_DENSITY := 450 @@ -194,13 +195,6 @@ TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH) # Security patch level VENDOR_SECURITY_PATCH := 2024-10-01 -# Sepolicy -#include device/qcom/sepolicy_vndr/SEPolicy.mk -#include device/lineage/sepolicy/libperfmgr/sepolicy.mk -#BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor -#SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private -#SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/public - # Verified Boot BOARD_AVB_ENABLE := true BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3 @@ -230,19 +224,15 @@ BOARD_AVB_ODM_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256 # VINTF DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ - $(DEVICE_PATH)/configs/vintf/compatibility_matrix.device.xml \ - $(DEVICE_PATH)/configs/vintf/compatibility_matrix.samsung.xml \ + $(DEVICE_PATH)/vintf/device_framework_matrix.xml \ hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \ - vendor/lineage/config/device_framework_matrix.xml \ - hardware/samsung/vintf/samsung_framework_compatibility_matrix.xml -DEVICE_FRAMEWORK_MANIFEST_FILE += $(DEVICE_PATH)/configs/vintf/framework_manifest.xml -DEVICE_MATRIX_FILE := \ - $(DEVICE_PATH)/configs/vintf/compatibility_matrix.xml \ - hardware/qcom-caf/common/compatibility_matrix.xml -DEVICE_MANIFEST_SKUS := pineapple -DEVICE_MANIFEST_PINEAPPLE_FILES := \ - $(DEVICE_PATH)/configs/vintf/manifest_pineapple.xml \ - $(DEVICE_PATH)/configs/vintf/manifest_samsung.xml + hardware/samsung/vintf/samsung_framework_compatibility_matrix.xml \ + vendor/lineage/config/device_framework_matrix.xml +# DEVICE_FRAMEWORK_MANIFEST_FILE +DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml +DEVICE_MANIFEST_FILE := \ + $(DEVICE_PATH)/vintf/manifest.xml + # Inherit the proprietary files include vendor/samsung/e3q/BoardConfigVendor.mk diff --git a/configs/vintf/compatibility_matrix.device.xml b/configs/vintf/compatibility_matrix.device.xml deleted file mode 100644 index aee417d..0000000 --- a/configs/vintf/compatibility_matrix.device.xml +++ /dev/null @@ -1,1662 +0,0 @@ - - - - - - - vendor.qti.hardware.scve.panorama - 1.0 - - IPanoramaTracking - panoTracking - - - IPanoramaStitching - panoStitching - - - - vendor.qti.hardware.scve.objecttracker - 1.0 - - IObjectTracker - objectTracker - - - - vendor.qti.hardware.perf - 2.0-3 - - IPerf - default - - - - vendor.qti.hardware.perf2 - 1 - - IPerf - default - - - - vendor.display.color - 1.0-7 - - IDisplayColor - default - - - - vendor.display.postproc - 1.0 - - IDisplayPostproc - default - - - - vendor.qti.hardware.display.color - 1 - - IDisplayColor - default - - - - vendor.qti.hardware.display.postproc - 1 - - IDisplayPostproc - default - - - - vendor.qti.hardware.display.demura - 1.0 - 2.0 - - IDemuraFileFinder - default - - - - vendor.qti.hardware.display.demura - 1 - - IDemuraFileFinder - default - - - - vendor.qti.hardware.qseecom - 1.0 - - IQSEECom - default - - - - vendor.qti.hardware.qseecom - 1 - - IQSEECom - default - - - - vendor.qti.hardware.qteeconnector - 1.0 - - IAppConnector - default - - - IGPAppConnector - default - - - - vendor.qti.hardware.qteeconnector - 1 - - IAppConnector - default - - - IGPAppConnector - default - - - - vendor.qti.hardware.debugutils - 1.0 - - IDebugUtils - default - - - - vendor.qti.hardware.factory - 1.0-1 - - IFactory - default - - - - vendor.qti.hardware.factory - 1 - - IFactory - default - - - - com.qualcomm.qti.dpm.api - 1.0 - - IdpmQmi - dpmQmiService - - - - android.hardware.nfc - 1.0 - - INfc - default - - - - android.hardware.nfc - 1 - - INfc - default - - - - android.hardware.radio - 1.0-4 - - IRadio - slot1 - slot2 - - - ISap - slot1 - slot2 - - - - vendor.qti.hardware.seccam - 1.0 - - ISecCam - default - - - - vendor.qti.hardware.improvetouch.touchcompanion - 1.0 - - ITouchCompanion - TouchCompanionService - - - - vendor.qti.hardware.bluetooth_audio - 2.0-1 - - IBluetoothAudioProvidersFactory - default - - - - com.qualcomm.qti.imscmservice - 2.0-2 - - IImsCmService - qti.ims.connectionmanagerservice - - - - com.qualcomm.qti.uceservice - 2.0-1 - 2.2 - 2.3 - - IUceService - com.qualcomm.qti.uceservice - - - - com.qualcomm.qti.wifidisplayhal - 1.0 - - IHDCPSession - wifidisplayhdcphal - - - IDSManager - wifidisplaydshal - - - - vendor.qti.hardware.wifidisplaysession - 1.0 - - IWifiDisplaySession - wifidisplaysession - - - IWifiDisplaySessionVideoTrack - wifidisplaysessionvideotrack - - - IWifiDisplaySessionAudioTrack - wifidisplaysessionaudiotrack - - - IWifiDisplaySessionImageTrack - wifidisplaysessionimagetrack - - - - com.quicinc.cne.server - 2.0-2 - - IServer - cnd - - - - com.quicinc.cne.api - 1.0-1 - - IApiService - cnd - - - - vendor.nxp.hardware.nfc - 1.0-1 - 2.0 - - INqNfc - default - - - - vendor.nxp.nxpnfc_aidl - 1 - - INxpNfc - default - - - - vendor.nxp.nxpnfclegacy - 1.0 - - INxpNfcLegacy - default - - - - vendor.qti.esepowermanager - 1.0-1 - - IEsePowerManager - default - - - - vendor.qti.hardware.alarm - 1.0 - - IAlarm - default - - - - vendor.qti.hardware.alarm - 1 - - IAlarm - default - - - - vendor.qti.hardware.data.latency - - 1.0 - - ILinkLatency - default - - - - vendor.qti.hardware.data.connection - 1.0-1 - - IDataConnection - slot1 - slot2 - - - - vendor.qti.hardware.data.connectionfactory - 1 - - IFactory - slot0 - slot1 - - - - vendor.qti.data.factoryservice - 1 - - IFactory - default - - - - vendor.qti.hardware.cacert - 1.0 - - IService - default - - - - vendor.qti.hardware.cacertaidlservice - 1 - - IService - default - - - - vendor.qti.hardware.fm - 1.0 - - IFmHci - default - - - - vendor.qti.hardware.btconfigstore - 1.0 - 2.0 - - IBTConfigStore - default - - - - com.dsi.ant - 1.0 - - IAnt - default - - - - vendor.qti.hardware.iop - 2.0 - - IIop - default - - - - vendor.qti.hardware.qdutils_disp - 1.0 - - IQdutilsDisp - default - - - - vendor.qti.hardware.radio.am - 1.0 - - IQcRilAudio - slot1 - slot2 - - - - vendor.qti.hardware.radio.am - 1 - - IQcRilAudio - slot1 - slot2 - - - - vendor.qti.hardware.radio.ims - 1.0-9 - - IImsRadio - imsradio0 - imsradio1 - - - - vendor.qti.hardware.radio.ims - 1-16 - - IImsRadio - imsradio0 - imsradio1 - - - - vendor.qti.hardware.radio.internal.deviceinfo - 1.0 - - IDeviceInfo - deviceinfo - - - - vendor.qti.hardware.radio.internal.deviceinfo - 1 - - IDeviceInfo - deviceinfo - - - - vendor.qti.hardware.radio.lpa - 1.0-3 - - IUimLpa - UimLpa0 - UimLpa1 - - - - vendor.qti.hardware.radio.lpa - 1 - - IUimLpa - UimLpa0 - UimLpa1 - - - - vendor.qti.hardware.radio.qcrilhook - 1.0 - - IQtiOemHook - oemhook0 - oemhook1 - - - - vendor.qti.hardware.radio.qcrilhook - 1 - - IQtiOemHook - oemhook0 - oemhook1 - - - - vendor.qti.hardware.radio.qtiradio - 1.0 - 2.0-7 - - IQtiRadio - slot1 - slot2 - - - - vendor.qti.hardware.radio.qtiradio - 1-11 - - IQtiRadioStable - slot1 - slot2 - - - - vendor.qti.hardware.radio.qtiradioconfig - 1-6 - - IQtiRadioConfig - default - - - - vendor.qti.hardware.radio.atfwd - 1 - - IAtFwd - AtFwdAidl - - - - vendor.qti.hardware.radio.uim_remote_client - 1.0 - - IUimRemoteServiceClient - uimRemoteClient0 - uimRemoteClient1 - - - - vendor.qti.hardware.radio.uim_remote_client - 1 - - IUimRemoteServiceClient - uimRemoteClient0 - uimRemoteClient1 - - - - vendor.qti.hardware.radio.uim_remote_server - 1.0 - - IUimRemoteServiceServer - uimRemoteServer0 - uimRemoteServer1 - - - - vendor.qti.hardware.radio.uim_remote_server - 1 - - IUimRemoteServiceServer - uimRemoteServer0 - uimRemoteServer1 - - - - vendor.qti.hardware.radio.uim - 1.1-2 - - IUim - Uim0 - Uim1 - - - - vendor.qti.hardware.radio.uim - 1 - - IUim - Uim0 - Uim1 - - - - vendor.qti.hardware.sensorscalibrate - 1.0 - - ISensorsCalibrate - default - - - - vendor.qti.hardware.sensorscalibrate - 1 - - ISensorsCalibrate - default - - - - vendor.qti.hardware.soter - 1.0 - - ISoter - default - - - - vendor.qti.hardware.eid - 1.0 - - IEid - default - - - - vendor.qti.hardware.tui_comm - 1.0 - - ITuiComm - default - - - - vendor.qti.hardware.vpp - 1.1-3 - 2.0 - - IHidlVppService - vppService - - - - vendor.qti.hardware.vpp - 1 - - IVppService - default - - - - vendor.qti.hardware.hexlp - 1 - - IHexlpService - default - - - - vendor.qti.hardware.qconfig - 1.0 - - IQConfig - default - - - - vendor.qti.hardware.qconfig - 1 - - IQConfig - default - - - - vendor.qti.hardware.dsp - 1.0 - - IDspService - dspservice - - - - android.hardware.wifi.supplicant - 1.0-2 - - ISupplicant - default - wigigp2p - - - - vendor.qti.hardware.wigig.netperftuner - 1.0 - - INetPerfTuner - default - - - - vendor.qti.hardware.wigig.supptunnel - 1.0 - - ISuppTunnelProvider - default - - - - vendor.qti.hardware.fstman - 1.0 - - IFstManager - default - - - - vendor.qti.imsrtpservice - 3.0 - 3.1 - - IRTPService - imsrtpservice - - - - vendor.qti.ImsRtpService - 1 - - IRTPService - ImsRtpService - - - - vendor.qti.mstatservice - 1.0 - - IMStatService - mstatservice - - - - vendor.qti.voiceprint - 1.0 - - IQtiVoicePrintService - default - - - - android.hardware.gnss - 1.0-1 - 2.0-1 - - IGnss - gnss_vendor - default - - - - vendor.qti.gnss - 1.0-2 - 2.0-1 - 3.0 - 4.0-3 - - ILocHidlGnss - gnss_vendor - - - - vendor.qti.gnss - 1-6 - - ILocAidlGnss - default - - - - vendor.qti.hardware.wifi.supplicant - 2.0-3 - - ISupplicantVendor - default - - - - vendor.qti.hardware.wifi.supplicant - 1 - - ISupplicantVendor - default - - - - vendor.qti.hardware.wifi.hostapd - 1.0-3 - - IHostapdVendor - default - wigighostapd - - - - vendor.qti.ims.callinfo - 1.0 - - IService - default - - - - vendor.qti.data.factory - 1.0 - 2.0-8 - - IFactory - default - - - - vendor.display.config - 1.0-15 - 2.0 - - IDisplayConfig - default - - - - vendor.qti.hardware.wipower - 1.0 - - IWipower - default - - - - vendor.qti.hardware.fingerprint - 1.0 - - IQtiExtendedFingerprint - default - - - - vendor.qti.hardware.fingerprint - 1 - - IQfpExtendedFingerprint - default - - - - - vendor.qti.memory.pasrmanager - 1 - - IPasrManager - default - - - - vendor.qti.memory.pasrmanager - hwbinder - 1.0-1 - - IPasrManager - pasrhal - - - - vendor.qti.power.pasrmanager - 1.0 - - IPasrManager - default - - - - vendor.qti.hardware.power.powermodule - 1.0 - - IPowerModule - default - - - - vendor.qti.hardware.power.powermodule - 1 - - IPowerModule - default - - - - android.hardware.radio.config - 1.0-1 - - IRadioConfig - default - - - - vendor.qti.hardware.capabilityconfigstore - 1.0 - - ICapabilityConfigStore - default - - - - vendor.qti.hardware.data.iwlan - 1.0-1 - - IIWlan - slot1 - slot2 - - - - vendor.qti.hardware.data.iwlandata - 1 - - IIWlan - slot1 - slot2 - - - - - vendor.qti.hardware.cvp - 1.0 - - ICvp - cvphalservice - - - - vendor.qti.hardware.audiohalext - 1.0 - - IAudioHalExt - default - - - - - android.hardware.media.c2 - 1.0 - 1.2 - - IComponentStore - default - software - - - - vendor.qti.hardware.display.allocator - 1.0 - 3.0 - 4.0 - - IQtiAllocator - default - - - - android.hardware.graphics.allocator - 1 - - IAllocator - default - - - - vendor.qti.hardware.display.mapper - 2.0 - 3.0 - 4.0 - - IQtiMapper - default - - - - vendor.qti.hardware.display.composer - 2.0-1 - 3.0 - 3.1 - 3.2 - - IQtiComposer - default - - - - - vendor.qti.qspmhal - 1.0 - - IQspmhal - default - - - - - vendor.qti.qspmhal - 1 - - IQspmhal - default - - - - vendor.qti.diaghal - 1.0 - - Idiag - default - - - - - vendor.qti.hardware.bluetooth_sar - 1.0-1 - - IBluetoothSar - default - - - - - vendor.qti.hardware.wifi.wifilearner - 1.0 - - IWifiStats - wifiStats - - - - android.hardware.automotive.evs - 1.1 - - IEvsEnumerator - default - - - - vendor.qti.automotive.qcarcam - 1.0 - - IQcarCamera - default - - - - - vendor.qti.hardware.systemhelper - 1.0 - - ISystemEvent - default - - - ISystemResource - default - - - - - vendor.qti.hardware.systemhelperaidl - 1 - - ISystemEvent - default - - - ISystemResource - default - - - - - vendor.qti.hardware.trustedui - 1.0-2 - - ITrustedUI - default - qtee-vm - - - ITrustedInput - default - qtee-vm - - - - - vendor.qti.hardware.trustedui - 1 - - ITrustedUI - default - - - ITrustedInput - default - - - - - vendor.qti.hardware.secureprocessor.device - 1.0 - - ISecureProcessor - qti-tee - qti-tvm - - - - vendor.qti.hardware.secureprocessor.device - 1 - - ISecureProcessor - qti-tee - qti-tvm - - - - - vendor.qti.hardware.cryptfshw - 1.0 - - ICryptfsHw - default - - - - - vendor.qti.hardware.servicetracker - hwbinder - 1.0-2 - - IServicetracker - default - - - - - vendor.qti.hardware.camera.postproc - hwbinder - 1.0 - - IPostProcService - camerapostprocservice - - - - - vendor.qti.hardware.camera.offlinecamera - 1 - - IOfflineCameraService - default - - - - - vendor.qti.hardware.camera.aon - hwbinder - 1.0-4 - - IAONService - aoncameraservice - - - - - vendor.qti.hardware.camera.aon - 1 - - IAONService - default - - - - - vendor.qti.hardware.embmssl - 1.0-1 - - IEmbms - embmsslServer0 - - - - vendor.qti.hardware.embmssl - 1 - - IEmbms - default - - - - vendor.qti.hardware.qccvndhal - 1.0 - - IQccvndhal - qccvndhal - - - - vendor.qti.qccvndhal_aidl - 1 - - IQccvndhal - qccvndhal - - - - vendor.qti.qepi - 1 - - IQEPI - qepi - - - - vendor.qti.ims.factory - 1.0-1 - 2.0-2 - - IImsFactory - default - - - - vendor.qti.spu - 1.0-1 - 2.0 - - ISPUManager - default - - - - vendor.qti.hardware.spu - 1-2 - - ISPUManager - default - - - - - vendor.qti.hardware.slmadapter - hwbinder - 1.0 - - ISlmAdapter - SlmAdapter - - - - - vendor.qti.hardware.mwqemadapter - hwbinder - 1.0 - - IMwqemAdapter - MwqemAdapter - - - - vendor.qti.hardware.mwqemadapteraidlservice - 1 - - IMwqemAdapter - MwqemAdapter - - - - - vendor.qti.hardware.dpmservice - hwbinder - 1.0-1 - - IDpmService - DpmService - - - - - vendor.qti.hardware.dpmaidlservice - 1 - - IDpmService - default - - - - - vendor.qti.hardware.limits - hwbinder - 1.0-2 - - ILimits - default - - - - - vendor.qti.hardware.AGMIPC - hwbinder - 1.0 - - IAGM - default - - - - - vendor.qti.hardware.pal - hwbinder - 1.0 - - IPAL - default - - - - - vendor.qti.hardware.ListenSoundModel - hwbinder - 1.0-2 - - IListenSoundModel - default - - - - vendor.qti.hardware.wifi.wifimyftm - hwbinder - 1.0 - - IWifiMyFtm - default - - - - vendor.qti.hardware.wifi.wifimyftm - 1 - - IWifiMyFtm - default - - - - vendor.qti.hardware.display.config - 1-11 - - IDisplayConfig - default - - - - vendor.qti.hardware.display.composer3 - 1 - - IQtiComposer3Client - default - - - - vendor.kineticsxr.hardware.nordic - 1.0 - - INordic - default - - - - vendor.qti.hardware.wifi.wificfr - hwbinder - 1.0 - - IWificfr - wificfr - - - - vendor.qti.hardware.wifi.wificfr - 1 - - IWificfr - default - - - - vendor.qti.qesdhal - hwbinder - 1.0-4 - - IQesdhal - default - - - - vendor.qti.qesdhalaidl - 1-2 - - IQesdhal - default - - - - vendor.qti.hardware.sxrhal - hwbinder - 1.0 - - ISxrCrypto - sxrhalservice - - - - vendor.qti.hardware.debugutils - 1 - - IDebugUtils - default - - - - vendor.qti.hardware.qxr - 1-2 - - IQXRCoreService - default - - - IQXRCamService - default - - - IQXRSplitService - default - - - IQXRModService - default - - - IQXRAudioService - default - - - IQXRCommService - default - - - - vendor.qti.hardware.radio.atcmdfwd - 1 - - IAtCmdFwd - AtCmdFwdAidl - - - - vendor.qti.data.txpwrservice - 1-6 - - ITxPwrService - default - - - - vendor.qti.hardware.bttpi - 1-3 - - IBtTpi - default - - - - vendor.qti.hardware.bluetooth.xpanprovider - 1 - - IXpanProvider - default - - - - android.se.omapi - 1 - - ISecureElementService - default - - - - - vendor.aks.gamepad - hwbinder - 1.0 - - IGamepad - default - - - - vendor.qti.ims.datachannelservice - 1-2 - - IDataChannelService - default - - - - vendor.qti.hardware.servicetrackeraidl - 1 - - IServicetracker - default - - - - - vendor.qti.qvirt - 1 - - IVirtualizationService - default - - - - vendor.qti.hardware.data.connectionaidl - 1 - - IDataConnection - slot1 - slot2 - - - - vendor.qti.ims.factoryaidlservice - 1 - - IImsFactory - default - - - - android.hardware.tetheroffload - 1 - - IOffload - default - - - - vendor.qti.hardware.soter - 1 - - ISoter - default - - - - - android.hardware.authsecret.qti.spu - 1 - - IAuthSecret - default - - - - vendor.qti.hardware.qspa - 1 - - IQspa - default - - - - - - vendor.qti.hardware.umd - hwbinder - 1.0 - - IUMDAdaptor - default - - - - vendor.qti.vst - - ICameraVstSys - default - - - ICameraVstSysFactory - default - - - ICameraVstSysCallback - default - - - - - vendor.qti.hardware.power.powerstateservice - hwbinder - 1.0 - - IPowerStateService - default - - - IPowerStateUtility - default - - - diff --git a/configs/vintf/compatibility_matrix.xml b/configs/vintf/compatibility_matrix.xml deleted file mode 100644 index 3761397..0000000 --- a/configs/vintf/compatibility_matrix.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - 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.sigma_miracast - hwbinder - 1.0 - - Isigma_miracast - sigmahal - sigmahal64 - - - - vendor.qti.hardware.qccsyshal - hwbinder - 1.0-2 - - IQccsyshal - qccsyshal - - - diff --git a/configs/vintf/framework_manifest.xml b/configs/vintf/framework_manifest.xml deleted file mode 100644 index 82904d2..0000000 --- a/configs/vintf/framework_manifest.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - vendor.qti.hardware.radio.atcmdfwd - hwbinder - 1.0 - - IAtCmdFwd - AtCmdFwdService - - - diff --git a/configs/vintf/manifest_pineapple.xml b/configs/vintf/manifest_pineapple.xml deleted file mode 100644 index 025b499..0000000 --- a/configs/vintf/manifest_pineapple.xml +++ /dev/null @@ -1,283 +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 - - - - - - - - - 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/strongbox - - - android.hardware.security.keymint - 3 - IRemotelyProvisionedComponent/strongbox - - diff --git a/configs/vintf/manifest_samsung.xml b/configs/vintf/manifest_samsung.xml deleted file mode 100644 index 12d2480..0000000 --- a/configs/vintf/manifest_samsung.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - vendor.samsung.hardware.media.mpp - 2 - ISehMppStore/default - - - vendor.samsung.hardware.security.hdcp.wifidisplay - 2 - ISehHdcp/default - - - vendor.samsung.hardware.snap - 2 - ISehSnap/default - - - vendor.samsung.hardware.sysinput - 2 - - ISehSysInputDev - default - - - ISehSysInputCallback - default - - - - vendor.samsung.hardware.keymint - 3 - ISehKeyMintExtension/default - - - vendor.samsung.hardware.keymint - 3 - ISehKeyMintFactory/default - - - vendor.samsung.hardware.bluetooth - hwbinder - @2.0::ISehBluetooth/default - - - android.hardware.weaver - 2 - - IWeaver - default - - - diff --git a/device.mk b/device.mk index 2dfe417..1a1e809 100644 --- a/device.mk +++ b/device.mk @@ -20,7 +20,12 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) $(call inherit-product, hardware/qcom-caf/common/common.mk) # API levels -PRODUCT_SHIPPING_API_LEVEL := 34 +BOARD_SHIPPING_API_LEVEL := 34 +PRODUCT_SHIPPING_API_LEVEL := $(BOARD_SHIPPING_API_LEVEL) + +# Boot animation +TARGET_SCREEN_HEIGHT := 3120 +TARGET_SCREEN_WIDTH := 1440 # DebugFS PRODUCT_SET_DEBUGFS_RESTRICTIONS := true @@ -30,6 +35,12 @@ PRODUCT_PACKAGES += \ android.hardware.fastboot@1.1-impl-mock \ fastbootd +# Keymint +PRODUCT_PACKAGES += \ + android.hardware.hardware_keystore.xml \ + android.hardware.security.sharedsecret-V2-ndk.vendor \ + android.hardware.weaver-V2-ndk.vendor + # Overlays PRODUCT_ENFORCE_RRO_TARGETS := * @@ -39,6 +50,14 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true # Product characteristics PRODUCT_CHARACTERISTICS := phone +# Protobuf +PRODUCT_PACKAGES += \ + libprotobuf-cpp-full-3.9.1-vendorcompat + +# QMI +PRODUCT_PACKAGES += \ + libjsoncpp.vendor + # Rootdir PRODUCT_PACKAGES += \ dcc_extension.sh \ @@ -106,5 +125,17 @@ PRODUCT_SOONG_NAMESPACES += \ kernel/samsung/sm8650 \ kernel/samsung/sm8650-modules +# Vendor service manager +PRODUCT_PACKAGES += \ + vndservicemanager + +# Verified Boot +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml + +# VNDK +PRODUCT_PACKAGES += \ + libcrypto-v33 + # Inherit the proprietary files $(call inherit-product, vendor/samsung/e3q/e3q-vendor.mk) diff --git a/extract-files.sh b/extract-files.sh index 36d7d59..a1e7438 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -64,22 +64,11 @@ fi function blob_fixup() { case "${1}" in - vendor/lib/libsample1.so) + vendor/bin/hw/android.hardware.security.keymint-service|vendor/lib64/libskeymint10device.so|vendor/lib64/libskeymint_cli.so) [ "$2" = "" ] && return 0 - sed -i 's|/data/misc/sample1|/data/misc/sample2|g' "${2}" - ;; - vendor/lib64/libsample2.so) - [ "$2" = "" ] && return 0 - "${PATCHELF}" --remove-needed "libsample3.so" "${2}" - "${PATCHELF}" --add-needed "libsample4.so" "${2}" - ;; - vendor/lib/libsample5.so) - [ "$2" = "" ] && return 0 - "${PATCHELF}" --replace-needed "libsample6.so" "libsample7.so" "${2}" - ;; - vendor/lib/libsample7.so) - [ "$2" = "" ] && return 0 - "${PATCHELF}" --set-soname "libsample7.so" "${2}" + grep -q "android.hardware.security.rkp-V3-ndk.so" "${2}" || ${PATCHELF} --add-needed "android.hardware.security.rkp-V3-ndk.so" "${2}" + ${PATCHELF} --replace-needed libcrypto.so libcrypto-v33.so "${2}" + #${PATCHELF} --replace-needed libcppbor_external.so libcppbor.so "${2}" ;; *) return 1 diff --git a/proprietary-files.txt b/proprietary-files.txt index 00dce6c..f38f82b 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -633,8 +633,8 @@ vendor/bin/hw/vendor.qti.hardware.display.composer-service vendor/etc/init/vendor.qti.hardware.display.allocator-service.rc vendor/etc/init/vendor.qti.hardware.display.color-service.rc vendor/etc/init/vendor.qti.hardware.display.composer-service.rc -vendor/etc/vintf/manifest/android.hardware.graphics.mapper-impl-qti-display.xml -vendor/etc/vintf/manifest/vendor.qti.hardware.display.allocator-service.xml +vendor/etc/vintf/manifest/android.hardware.graphics.mapper-impl-qti-display.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.qti.hardware.display.allocator-service.xml;MAKE_COPY_RULE_ONLY vendor/lib64/egl/eglSubDriverAndroid.so vendor/lib64/egl/libEGL_adreno.so vendor/lib64/egl/libGLESv1_CM_adreno.so @@ -774,7 +774,7 @@ vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service vendor/bin/qseecomd vendor/etc/init/qseecomd.rc vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc -vendor/etc/vintf/manifest/vendor.qti.hardware.qseecom@1.0-service.xml +vendor/etc/vintf/manifest/vendor.qti.hardware.qseecom@1.0-service.xml;MAKE_COPY_RULE_ONLY vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so vendor/lib64/libQSEEComAPI.so vendor/lib64/libdrmfs.so @@ -830,8 +830,7 @@ vendor/bin/loc_launcher vendor/bin/lowi-server vendor/bin/xtra-daemon vendor/etc/init/android.hardware.gnss-aidl-service-qti.rc -vendor/etc/vintf/manifest/android.hardware.gnss-aidl-service-qti.xml -vendor/etc/vintf/manifest/vendor.qti.gnss-service.xml +vendor/etc/vintf/manifest/vendor.qti.gnss-service.xml;MAKE_COPY_RULE_ONLY vendor/lib64/hw/vendor.samsung.hardware.gnss-aidl-impl-sec.so vendor/lib64/libdataitems.so vendor/lib64/libgps.utils.so @@ -998,7 +997,7 @@ vendor/etc/perf/targetresourceconfigs.xml vendor/etc/perf/targetsysnodesconfigs.xml vendor/etc/perf/testcommonresourceconfigs.xml vendor/etc/perf/testtargetresourceconfigs.xml -vendor/etc/vintf/manifest/vendor.qti.hardware.perf2.xml +vendor/etc/vintf/manifest/vendor.qti.hardware.perf2.xml;MAKE_COPY_RULE_ONLY vendor/etc/powerhint.xml vendor/lib64/libperfconfig.so vendor/lib64/libperfgluelayer.so @@ -1043,7 +1042,7 @@ system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so system_ext/lib64/vendor.qti.hardware.qccvndhal@1.0.so system_ext/lib64/vendor.qti.qccvndhal_aidl-V1-ndk.so vendor/bin/qcc-vendor -vendor/etc/vintf/manifest/vendor.qti.qccvndhal_aidl-service.xml +vendor/etc/vintf/manifest/vendor.qti.qccvndhal_aidl-service.xml;MAKE_COPY_RULE_ONLY vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so vendor/lib64/vendor.qti.hardware.qccsyshal@1.1.so vendor/lib64/vendor.qti.hardware.qccsyshal@1.2.so @@ -1169,7 +1168,7 @@ vendor/bin/hw/android.hardware.security.keymint-service vendor/bin/hw/android.hardware.security.keymint-service-spu-qti vendor/etc/init/android.hardware.security.keymint-service-spu-qti.rc vendor/etc/init/android.hardware.security.keymint-service.rc -#vendor/etc/vintf/manifest/android.hardware.security.keymint-service-spu-qti.xml +vendor/etc/vintf/manifest/android.hardware.security.keymint-service-spu-qti.xml vendor/lib64/libcppbor_external.so vendor/lib64/libhermes_cred.so vendor/lib64/libkeymaster4_1support.so @@ -1187,7 +1186,7 @@ vendor/bin/hw/android.hardware.sensors-service.multihal vendor/bin/sensors.qti vendor/bin/sscrpcd vendor/etc/init/android.hardware.sensors-service-multihal.rc -vendor/etc/vintf/manifest/android.hardware.sensors-multihal.xml +vendor/etc/vintf/manifest/android.hardware.sensors-multihal.xml;MAKE_COPY_RULE_ONLY vendor/lib64/hw/sensors.dynamic_sensor_hal.so vendor/lib64/libhidparser.so vendor/lib64/libqsh.so @@ -1277,7 +1276,7 @@ vendor/bin/hw/vendor.qti.hardware.trustedui@1.0-service-qti vendor/bin/TrustedUISampleTest vendor/etc/init/vendor.qti.hardware.trustedui-aidl-service-qti.rc vendor/etc/init/vendor.qti.hardware.trustedui@1.0-service-qti.rc -vendor/etc/vintf/manifest/vendor.qti.hardware.trustedui-aidl-service.xml +vendor/etc/vintf/manifest/vendor.qti.hardware.trustedui-aidl-service.xml;MAKE_COPY_RULE_ONLY vendor/lib64/libTouchInputVM.so vendor/lib64/libTrustedInput.so vendor/lib64/libTrustedInputAIDL.so @@ -1297,7 +1296,7 @@ vendor/lib64/vendor.qti.hardware.trustedui@1.2.so # USB vendor/bin/hw/android.hardware.usb-service.qti vendor/etc/init/android.hardware.usb-service.qti.rc -vendor/etc/vintf/manifest/android.hardware.usb-service.qti.xml +vendor/etc/vintf/manifest/android.hardware.usb-service.qti.xml;MAKE_COPY_RULE_ONLY # Vibrator vendor/lib64/hw/vibrator.default.so @@ -1832,54 +1831,53 @@ vendor/etc/ssg/ta_config.json vendor/etc/ssg/tz_whitelist.json vendor/etc/str/str_preference_data.dat vendor/etc/sysconfig/vendor-apex-allowlist.xml -vendor/etc/vintf/manifest/androd.hardware.camera.provider-external-service.xml -vendor/etc/vintf/manifest/atfwd-saidl.xml -vendor/etc/vintf/manifest/bluetooth_audio.xml -vendor/etc/vintf/manifest/bttpi-saidl.xml -vendor/etc/vintf/manifest/drk_manifest.xml -vendor/etc/vintf/manifest/face-default-sec.xml -vendor/etc/vintf/manifest/hyper-default-sec.xml -vendor/etc/vintf/manifest/iweaver_aidl_v2_manifest.xml -vendor/etc/vintf/manifest/khdm-default-sec.xml -vendor/etc/vintf/manifest/manifest_non_qmaa.xml -vendor/etc/vintf/manifest/manifest_non_qmaa_extn.xml -vendor/etc/vintf/manifest/memtrack_qti.xml -vendor/etc/vintf/manifest/mpos-default-sec.xml -vendor/etc/vintf/manifest/power-samsung.xml -vendor/etc/vintf/manifest/qms-saidl.xml -vendor/etc/vintf/manifest/sec_c2_manifest_default0_1_2.xml -vendor/etc/vintf/manifest/vendor.qti.camera.aon-impl.xml -vendor/etc/vintf/manifest/vendor.qti.camera.offlinecamera-impl.xml -vendor/etc/vintf/manifest/vendor.qti.camera.postproc-impl.xml -vendor/etc/vintf/manifest/vendor.qti.diag.hal.service.xml -vendor/etc/vintf/manifest/vendor.qti.hardware.display.demura-service.xml -vendor/etc/vintf/manifest/vendor.qti.hardware.tetheroffload.service.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.authfw-manifest.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.biometrics.fingerprint-service.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.camera.provider-service.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.frcmc-service.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.qcom.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_34.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.security.engmode-manifest.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.security.fkeymaster-service.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.security.hdcp.keyprovisioning-default.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.security.hermes.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.security.rtts-manifest.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.security.sem@1.0-manifest.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.security.skpm@1.0-manifest.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.security.vaultkeeper-manifest.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.security.widevine.keyprov-service.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.security.wsm.service-manifest.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_34.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.thermal-default.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.tlc.ddar-default.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.tlc.iccc@1.0-manifest.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.tlc.kg-manifest.xml -vendor/etc/vintf/manifest/vendor.samsung.hardware.tlc.snap@1.0-manifest.xml -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/androd.hardware.camera.provider-external-service.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/atfwd-saidl.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/bluetooth_audio.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/bttpi-saidl.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/drk_manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/face-default-sec.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/iweaver_aidl_v2_manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/khdm-default-sec.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/manifest_non_qmaa.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/manifest_non_qmaa_extn.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/memtrack_qti.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/mpos-default-sec.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/power-samsung.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/qms-saidl.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/sec_c2_manifest_default0_1_2.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.qti.camera.aon-impl.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.qti.camera.offlinecamera-impl.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.qti.camera.postproc-impl.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.qti.diag.hal.service.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.qti.hardware.display.demura-service.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.qti.hardware.tetheroffload.service.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.authfw-manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.biometrics.fingerprint-service.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.camera.provider-service.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.frcmc-service.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.qcom.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_34.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.security.engmode-manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.security.fkeymaster-service.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.security.hdcp.keyprovisioning-default.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.security.hermes.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.security.rtts-manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.security.sem@1.0-manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.security.skpm@1.0-manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.security.vaultkeeper-manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.security.widevine.keyprov-service.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.security.wsm.service-manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_34.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.thermal-default.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.tlc.ddar-default.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.tlc.iccc@1.0-manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.tlc.kg-manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.tlc.snap@1.0-manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.tlc.ucm-manifest.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.uwb@1.0-service.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.vibrator-default.xml;MAKE_COPY_RULE_ONLY +vendor/etc/vintf/manifest/vendor.samsung.hardware.wifi-service.xml;MAKE_COPY_RULE_ONLY vendor/etc/DsgpPolicy.csv vendor/etc/Hapticsconfig.xml vendor/etc/IPACM_Filter_cfg.xml @@ -1894,7 +1892,6 @@ vendor/etc/boringssl_self_test.zygote64.rc vendor/etc/boringssl_self_test.zygote64_32.rc vendor/etc/btcon.json vendor/etc/card-defs.xml -vendor/etc/charger_fw_fstab.qti vendor/etc/clstc_config_library.xml vendor/etc/dax3_media_codecs_dolby_audio.xml vendor/etc/djsk @@ -1902,8 +1899,6 @@ vendor/etc/dpolicy vendor/etc/excluded-input-devices.xml vendor/etc/external_camera_config.xml vendor/etc/floating_feature.xml -vendor/etc/fstab.qcom -vendor/etc/fstab.ramplus vendor/etc/gnss_antenna_info.conf vendor/etc/gpfspath_oem_config.xml vendor/etc/hdr_samsung_mx.key diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 85c1901..d9f6221 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -47,7 +47,8 @@ odm /odm e /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 -/dev/block/bootdevice/by-name/apnhlos /vendor/firmware_mnt vfat ro,context=u:object_r:firmware_file:s0,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337 wait +# TODO SELinux Labels +/dev/block/bootdevice/by-name/apnhlos /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337 wait /dev/block/bootdevice/by-name/modem /vendor/firmware-modem vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait /dev/block/bootdevice/by-name/efs /mnt/vendor/efs ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check /dev/block/bootdevice/by-name/sec_efs /efs ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check diff --git a/configs/vintf/compatibility_matrix.samsung.xml b/vintf/device_framework_matrix.xml similarity index 61% rename from configs/vintf/compatibility_matrix.samsung.xml rename to vintf/device_framework_matrix.xml index 1258da7..eff2d76 100644 --- a/configs/vintf/compatibility_matrix.samsung.xml +++ b/vintf/device_framework_matrix.xml @@ -1,8 +1,4 @@ - - + vendor.samsung.hardware.authfw @@ -19,7 +15,6 @@ SPDX-License-Identifier: Apache-2.0 vendor.samsung.hardware.gnss - 2 ISehGnss default @@ -27,7 +22,6 @@ SPDX-License-Identifier: Apache-2.0 vendor.samsung.hardware.hyper - 2 ISehHyPer default @@ -40,14 +34,6 @@ SPDX-License-Identifier: Apache-2.0 default - - vendor.samsung.hardware.media.mpp - 2 - - ISehMppStore - default - - vendor.samsung.hardware.mpos @@ -55,56 +41,6 @@ SPDX-License-Identifier: Apache-2.0 default - - vendor.samsung.hardware.radio.bridge - - ISehRadioBridge - slot1 - slot2 - - - - vendor.samsung.hardware.radio.channel - - ISehRadioChannel - epdgd - epdgd2 - imsd - imsd2 - - - - vendor.samsung.hardware.radio.data - - ISehRadioData - slot1 - slot2 - - - - vendor.samsung.hardware.radio.messaging - - ISehRadioMessaging - slot1 - slot2 - - - - vendor.samsung.hardware.radio.network - - ISehRadioNetwork - slot1 - slot2 - - - - vendor.samsung.hardware.radio.sim - - ISehRadioSim - slot1 - slot2 - - vendor.samsung.hardware.security.drk @@ -133,14 +69,6 @@ SPDX-License-Identifier: Apache-2.0 default - - vendor.samsung.hardware.security.hdcp.wifidisplay - 2 - - ISehHdcp - default - - vendor.samsung.hardware.security.hermes @@ -192,26 +120,6 @@ SPDX-License-Identifier: Apache-2.0 default - - vendor.samsung.hardware.snap - 2 - - ISehSnap - default - - - - vendor.samsung.hardware.sysinput - 2 - - ISehSysInputCallback - default - - - ISehSysInputDev - default - - vendor.samsung.hardware.tlc.ddar @@ -219,14 +127,6 @@ SPDX-License-Identifier: Apache-2.0 default - - vendor.samsung.hardware.tlc.iccc - 1.0 - - ISehIccc - default - - vendor.samsung.hardware.tlc.kg @@ -263,7 +163,7 @@ SPDX-License-Identifier: Apache-2.0 default - + vendor.samsung.hardware.keymint 1-3 @@ -279,12 +179,4 @@ SPDX-License-Identifier: Apache-2.0 default - diff --git a/vintf/manifest.xml b/vintf/manifest.xml new file mode 100644 index 0000000..ea244e9 --- /dev/null +++ b/vintf/manifest.xml @@ -0,0 +1,16 @@ + + + + vendor.samsung.hardware.keymint + 3 + ISehKeyMintExtension/default + + + vendor.samsung.hardware.keymint + 3 + ISehKeyMintFactory/default + +