diff --git a/BoardConfig.mk b/BoardConfig.mk
index 48fa42f..e088e5e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -73,6 +73,8 @@ TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS := 0x200000U | 0x2000U
# HIDL
DEVICE_FRAMEWORK_MANIFEST_FILE := $(DEVICE_PATH)/framework_manifest.xml
+DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml
+DEVICE_MATRIX_FILE := $(DEVICE_PATH)/compatibility_matrix.xml
# Partitions
BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
new file mode 100644
index 0000000..310482d
--- /dev/null
+++ b/compatibility_matrix.xml
@@ -0,0 +1,66 @@
+
+
+ android.frameworks.schedulerservice
+ 1.0
+
+ ISchedulingPolicyService
+ 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
+
+
+
+ android.system.wifi.keystore
+ 1.0
+
+ IKeystore
+ default
+
+
+
+ vendor.qti.hardware.wifi.keystore
+ 1.0
+
+ IKeystoreExt
+ default
+
+
+
diff --git a/manifest.xml b/manifest.xml
new file mode 100644
index 0000000..6f332e5
--- /dev/null
+++ b/manifest.xml
@@ -0,0 +1,672 @@
+
+
+ android.hardware.audio
+ hwbinder
+ 5.0
+
+ IDevicesFactory
+ default
+
+ @5.0::IDevicesFactory/default
+
+
+ android.hardware.audio.effect
+ hwbinder
+ 5.0
+
+ IEffectsFactory
+ default
+
+ @5.0::IEffectsFactory/default
+
+
+ android.hardware.biometrics.fingerprint
+ hwbinder
+ 2.1
+
+ IBiometricsFingerprint
+ default
+
+ @2.1::IBiometricsFingerprint/default
+
+
+ android.hardware.bluetooth
+ hwbinder
+ 1.0
+
+ IBluetoothHci
+ default
+
+ @1.0::IBluetoothHci/default
+
+
+ android.hardware.bluetooth.audio
+ hwbinder
+ 2.0
+
+ IBluetoothAudioProvidersFactory
+ default
+
+ @2.0::IBluetoothAudioProvidersFactory/default
+
+
+ android.hardware.camera.provider
+ hwbinder
+ 2.4
+
+ ICameraProvider
+ legacy/0
+
+ @2.4::ICameraProvider/legacy/0
+
+
+ android.hardware.configstore
+ hwbinder
+ 1.1
+
+ ISurfaceFlingerConfigs
+ default
+
+ @1.1::ISurfaceFlingerConfigs/default
+
+
+ android.hardware.drm
+ hwbinder
+ 1.0
+
+ ICryptoFactory
+ default
+
+
+ IDrmFactory
+ default
+
+ @1.0::ICryptoFactory/default
+ @1.0::IDrmFactory/default
+ @1.1::ICryptoFactory/wfdhdcp
+ @1.1::IDrmFactory/wfdhdcp
+ @1.2::ICryptoFactory/clearkey
+ @1.2::ICryptoFactory/widevine
+ @1.2::IDrmFactory/clearkey
+ @1.2::IDrmFactory/widevine
+
+
+ android.hardware.gatekeeper
+ hwbinder
+ 1.0
+
+ IGatekeeper
+ default
+
+ @1.0::IGatekeeper/default
+
+
+ android.hardware.graphics.allocator
+ hwbinder
+ 2.0
+
+ IAllocator
+ default
+
+ @2.0::IAllocator/default
+
+
+ android.hardware.graphics.composer
+ hwbinder
+ 2.3
+
+ IComposer
+ default
+
+ @2.3::IComposer/default
+
+
+ android.hardware.graphics.mapper
+ passthrough
+ 2.1
+
+ IMapper
+ default
+
+ @2.1::IMapper/default
+
+
+ android.hardware.health
+ hwbinder
+ 2.0
+
+ IHealth
+ default
+
+ @2.0::IHealth/default
+
+
+ android.hardware.keymaster
+ hwbinder
+ 4.0
+
+ IKeymasterDevice
+ default
+
+ @4.0::IKeymasterDevice/default
+
+
+ android.hardware.light
+ hwbinder
+ 2.0
+
+ ILight
+ default
+
+ @2.0::ILight/default
+
+
+ android.hardware.media.omx
+ hwbinder
+ 1.0
+
+ IOmx
+ default
+
+
+ IOmxStore
+ default
+
+ @1.0::IOmx/default
+ @1.0::IOmxStore/default
+
+
+ android.hardware.memtrack
+ hwbinder
+ 1.0
+
+ IMemtrack
+ default
+
+ @1.0::IMemtrack/default
+
+
+ android.hardware.neuralnetworks
+ hwbinder
+ 1.2
+
+ IDevice
+ qti-default
+ qti-dsp
+ qti-gpu
+
+ @1.2::IDevice/qti-default
+ @1.2::IDevice/qti-dsp
+ @1.2::IDevice/qti-gpu
+
+
+ android.hardware.radio
+ hwbinder
+ @1.2::ISap/slot1
+ @1.2::ISap/slot2
+ @1.4::IRadio/slot1
+ @1.4::IRadio/slot2
+
+
+ android.hardware.radio.config
+ hwbinder
+ 1.1
+
+ IRadioConfig
+ default
+
+ @1.1::IRadioConfig/default
+
+
+ android.hardware.renderscript
+ passthrough
+ 1.0
+
+ IDevice
+ default
+
+ @1.0::IDevice/default
+
+
+ android.hardware.secure_element
+ hwbinder
+ 1.0
+
+ ISecureElement
+ SIM1
+ SIM2
+
+ @1.0::ISecureElement/SIM1
+ @1.0::ISecureElement/SIM2
+
+
+ android.hardware.sensors
+ hwbinder
+ 2.0
+
+ ISensors
+ default
+
+ @2.0::ISensors/default
+
+
+ android.hardware.soundtrigger
+ hwbinder
+ 2.2
+
+ ISoundTriggerHw
+ default
+
+ @2.1::ISoundTriggerHw/default
+
+
+ android.hardware.tetheroffload.control
+ hwbinder
+ 1.0
+
+ IOffloadControl
+ default
+
+ @1.0::IOffloadControl/default
+
+
+ android.hardware.vibrator
+ hwbinder
+ 1.0
+
+ IVibrator
+ default
+
+ @1.0::IVibrator/default
+
+
+ com.qualcomm.qti.ant
+ hwbinder
+ 1.0
+
+ IAntHci
+ default
+
+ @1.0::IAntHci/default
+
+
+ com.qualcomm.qti.dpm.api
+ hwbinder
+ 1.0
+
+ IdpmQmi
+ dpmQmiService
+
+ @1.0::IdpmQmi/dpmQmiService
+
+
+ com.qualcomm.qti.imscmservice
+ hwbinder
+ 2.2
+
+ IImsCmService
+ qti.ims.connectionmanagerservice
+
+ @2.2::IImsCmService/qti.ims.connectionmanagerservice
+
+
+ com.qualcomm.qti.uceservice
+ hwbinder
+ 2.1
+
+ IUceService
+ com.qualcomm.qti.uceservice
+
+ @2.1::IUceService/com.qualcomm.qti.uceservice
+
+
+ vendor.display.color
+ hwbinder
+ 1.2
+
+ IDisplayColor
+ default
+
+ @1.2::IDisplayColor/default
+
+
+ vendor.display.config
+ hwbinder
+ 1.7
+
+ IDisplayConfig
+ default
+
+ @1.7::IDisplayConfig/default
+
+
+ vendor.display.postproc
+ hwbinder
+ 1.0
+
+ IDisplayPostproc
+ default
+
+ @1.0::IDisplayPostproc/default
+
+
+ vendor.qti.data.factory
+ hwbinder
+ 2.0
+
+ IFactory
+ default
+
+ @2.0::IFactory/default
+
+
+ vendor.qti.esepowermanager
+ hwbinder
+ 1.0
+
+ IEsePowerManager
+ default
+
+ @1.0::IEsePowerManager/default
+
+
+ vendor.qti.hardware.alarm
+ hwbinder
+ 1.0
+
+ IAlarm
+ default
+
+ @1.0::IAlarm/default
+
+
+ vendor.qti.hardware.bluetooth_audio
+ hwbinder
+ 2.0
+
+ IBluetoothAudioProvidersFactory
+ default
+
+ @2.0::IBluetoothAudioProvidersFactory/default
+
+
+ vendor.qti.hardware.bluetooth_sar
+ hwbinder
+ 1.0
+
+ IBluetoothSar
+ default
+
+ @1.0::IBluetoothSar/default
+
+
+ vendor.qti.hardware.btconfigstore
+ hwbinder
+ 1.0
+
+ IBTConfigStore
+ default
+
+ @1.0::IBTConfigStore/default
+
+
+ vendor.qti.hardware.capabilityconfigstore
+ hwbinder
+ 1.0
+
+ ICapabilityConfigStore
+ default
+
+ @1.0::ICapabilityConfigStore/default
+
+
+ vendor.qti.hardware.data.connection
+ hwbinder
+ 1.1
+
+ IDataConnection
+ slot1
+ slot2
+
+ @1.1::IDataConnection/slot1
+ @1.1::IDataConnection/slot2
+
+
+ vendor.qti.hardware.data.latency
+ hwbinder
+ 1.0
+
+ ILinkLatency
+ default
+
+ @1.0::ILinkLatency/default
+
+
+ vendor.qti.hardware.fm
+ hwbinder
+ 1.0
+
+ IFmHci
+ default
+
+ @1.0::IFmHci/default
+
+
+ vendor.qti.hardware.perf
+ hwbinder
+ 2.0
+
+ IPerf
+ default
+
+ @2.0::IPerf/default
+
+
+ vendor.qti.hardware.qteeconnector
+ hwbinder
+ 1.0
+
+ IAppConnector
+ default
+
+
+ IGPAppConnector
+ default
+
+ @1.0::IAppConnector/default
+ @1.0::IGPAppConnector/default
+
+
+ vendor.qti.hardware.radio.am
+ hwbinder
+ 1.0
+
+ IQcRilAudio
+ slot1
+ slot2
+
+ @1.0::IQcRilAudio/slot1
+ @1.0::IQcRilAudio/slot2
+
+
+ vendor.qti.hardware.radio.ims
+ hwbinder
+ 1.5
+
+ IImsRadio
+ imsradio0
+ imsradio1
+
+ @1.5::IImsRadio/imsradio0
+ @1.5::IImsRadio/imsradio1
+
+
+ vendor.qti.hardware.radio.lpa
+ hwbinder
+ 1.0
+
+ IUimLpa
+ UimLpa0
+ UimLpa1
+
+ @1.0::IUimLpa/UimLpa0
+ @1.0::IUimLpa/UimLpa1
+
+
+ vendor.qti.hardware.radio.qcrilhook
+ hwbinder
+ 1.0
+
+ IQtiOemHook
+ oemhook0
+ oemhook1
+
+ @1.0::IQtiOemHook/oemhook0
+ @1.0::IQtiOemHook/oemhook1
+
+
+ vendor.qti.hardware.radio.qtiradio
+ hwbinder
+ 1.0
+
+ IQtiRadio
+ slot1
+ slot2
+
+ @1.0::IQtiRadio/slot1
+ @1.0::IQtiRadio/slot2
+
+
+ vendor.qti.hardware.radio.qtiradio
+ hwbinder
+ 2.3
+
+ IQtiRadio
+ slot1
+ slot2
+
+ @2.3::IQtiRadio/slot1
+ @2.3::IQtiRadio/slot2
+
+
+ vendor.qti.hardware.radio.uim
+ hwbinder
+ 1.2
+
+ IUim
+ Uim0
+ Uim1
+
+ @1.2::IUim/Uim0
+ @1.2::IUim/Uim1
+
+
+ vendor.qti.hardware.radio.uim_remote_client
+ hwbinder
+ 1.0
+
+ IUimRemoteServiceClient
+ uimRemoteClient0
+ uimRemoteClient1
+
+ @1.0::IUimRemoteServiceClient/uimRemoteClient0
+ @1.0::IUimRemoteServiceClient/uimRemoteClient1
+
+
+ vendor.qti.hardware.radio.uim_remote_server
+ hwbinder
+ 1.0
+
+ IUimRemoteServiceServer
+ uimRemoteServer0
+ uimRemoteServer1
+
+ @1.0::IUimRemoteServiceServer/uimRemoteServer0
+ @1.0::IUimRemoteServiceServer/uimRemoteServer1
+
+
+ vendor.qti.hardware.sensorscalibrate
+ hwbinder
+ 1.0
+
+ ISensorsCalibrate
+ default
+
+ @1.0::ISensorsCalibrate/default
+
+
+ vendor.qti.hardware.soter
+ hwbinder
+ 1.0
+
+ ISoter
+ default
+
+ @1.0::ISoter/default
+
+
+ vendor.qti.hardware.tui_comm
+ hwbinder
+ 1.0
+
+ ITuiComm
+ default
+
+ @1.0::ITuiComm/default
+
+
+ vendor.qti.hardware.vpp
+ hwbinder
+ 1.1
+
+ IHidlVppService
+ vppService
+
+ @1.1::IHidlVppService/vppService
+
+
+ vendor.qti.hardware.wifidisplaysession
+ hwbinder
+ 1.0
+
+ IWifiDisplaySession
+ wifidisplaysession
+
+
+ IWifiDisplaySessionAudioTrack
+ wifidisplaysessionaudiotrack
+
+
+ IWifiDisplaySessionImageTrack
+ wifidisplaysessionimagetrack
+
+
+ IWifiDisplaySessionVideoTrack
+ wifidisplaysessionvideotrack
+
+ @1.0::IWifiDisplaySession/wifidisplaysession
+ @1.0::IWifiDisplaySessionAudioTrack/wifidisplaysessionaudiotrack
+ @1.0::IWifiDisplaySessionImageTrack/wifidisplaysessionimagetrack
+ @1.0::IWifiDisplaySessionVideoTrack/wifidisplaysessionvideotrack
+
+
+ vendor.qti.ims.callinfo
+ hwbinder
+ 1.0
+
+ IService
+ default
+
+ @1.0::IService/default
+
+
+ vendor.qti.imsrtpservice
+ hwbinder
+ 2.1
+
+ IRTPService
+ imsrtpservice
+
+ @2.1::IRTPService/imsrtpservice
+
+