From 56aeee51980069ed423d3cdb74a3bc5d3f9828b2 Mon Sep 17 00:00:00 2001 From: Sebastiano Barezzi Date: Tue, 8 Jun 2021 02:08:15 +0200 Subject: [PATCH] sm7325-common: Use only full qualified name for manifest entries * As recommended by Google for multiple different versions of the same HAL in VINTF manifests * https://android.googlesource.com/platform/hardware/interfaces/+/master/drm/1.1/README.md#devices-launching-with-android-pie Change-Id: I4922d72ab60ca1aae78c010aeb610f9bca9012cb --- manifest.xml | 383 +++++++++-------------------------------------- manifest_nfc.xml | 8 +- 2 files changed, 75 insertions(+), 316 deletions(-) diff --git a/manifest.xml b/manifest.xml index 7584212..2f5bcdd 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,44 +1,28 @@ android.hardware.audio hwbinder - 6.0 - - IDevicesFactory - default - + @6.0::IDevicesFactory/default android.hardware.audio.effect hwbinder - 6.0 - - IEffectsFactory - default - + @6.0::IEffectsFactory/default android.hardware.bluetooth hwbinder - 1.0 - - IBluetoothHci - default - + @1.0::IBluetoothHci/default android.hardware.camera.provider hwbinder - 2.4 - - ICameraProvider - legacy/0 - + @2.4::ICameraProvider/legacy/0 android.hardware.drm @@ -49,11 +33,7 @@ android.hardware.gatekeeper hwbinder - 1.0 - - IGatekeeper - default - + @1.0::IGatekeeper/default android.hardware.keymaster @@ -63,12 +43,8 @@ android.hardware.media.c2 hwbinder - 1.0 - - IComponentStore - default - software - + @1.0::IComponentStore/default + @1.0::IComponentStore/software android.hardware.radio @@ -81,396 +57,225 @@ android.hardware.radio.config hwbinder - 1.1 - - IRadioConfig - default - + @1.1::IRadioConfig/default android.hardware.soundtrigger hwbinder - 2.3 - - ISoundTriggerHw - default - + @2.3::ISoundTriggerHw/default android.hardware.tetheroffload.config hwbinder - 1.0 - - IOffloadConfig - default - + @1.0::IOffloadConfig/default android.hardware.tetheroffload.control hwbinder - 1.1 - - IOffloadControl - default - + @1.1::IOffloadControl/default com.dsi.ant hwbinder - 1.0 - - IAnt - default - + @1.0::IAnt/default com.motorola.hardware.biometric.fingerprint hwbinder - 1.0 - - IMotoFingerPrint - default - - - IMotoFingerPrintSensorTest - default - + @1.0::IMotoFingerPrint/default + @1.0::IMotoFingerPrintSensorTest/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.3 - - IUceService - com.qualcomm.qti.uceservice - + @2.3::IUceService/com.qualcomm.qti.uceservice motorola.hardware.camera.desktop hwbinder - 1.0 - 2.0 - - ICameraDesktop - default - + @1.0::ICameraDesktop/default + @2.0::ICameraDesktop/default vendor.qti.data.factory hwbinder - 2.3 - - IFactory - default - + @2.3::IFactory/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.1 - - IBluetoothSar - default - + @1.1::IBluetoothSar/default vendor.qti.hardware.btconfigstore hwbinder - 2.0 - - IBTConfigStore - default - + @2.0::IBTConfigStore/default vendor.qti.hardware.cacert hwbinder - 1.0 - - IService - default - + @1.0::IService/default vendor.qti.hardware.camera.postproc hwbinder - 1.0 - - IPostProcService - camerapostprocservice - + @1.0::IPostProcService/camerapostprocservice 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.iwlan hwbinder - 1.0 - - IIWlan - slot1 - slot2 - + @1.0::IIWlan/slot1 + @1.0::IIWlan/slot2 vendor.qti.hardware.data.latency hwbinder - 1.0 - - ILinkLatency - default - + @1.0::ILinkLatency/default vendor.qti.hardware.dsp hwbinder - 1.0 - - IDspService - dspservice - + @1.0::IDspService/dspservice vendor.qti.hardware.eid hwbinder - 1.0 - - IEid - default - + @1.0::IEid/default vendor.qti.hardware.embmssl hwbinder - 1.1 - - IEmbms - embmsslServer0 - + @1.1::IEmbms/embmsslServer0 vendor.qti.hardware.fm hwbinder - 1.0 - - IFmHci - default - + @1.0::IFmHci/default vendor.qti.hardware.iop hwbinder - 2.0 - - IIop - default - + @2.0::IIop/default vendor.qti.hardware.perf hwbinder - 2.2 - - IPerf - default - + @2.2::IPerf/default vendor.qti.hardware.qccvndhal hwbinder - 1.0 - - IQccvndhal - qccvndhal - + @1.0::IQccvndhal/qccvndhal vendor.qti.hardware.qconfig hwbinder - 1.0 - - IQConfig - default - + @1.0::IQConfig/default vendor.qti.hardware.qseecom hwbinder - 1.0 - - IQSEECom - default - + @1.0::IQSEECom/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.7 - - IImsRadio - imsradio0 - imsradio1 - + @1.7::IImsRadio/imsradio0 + @1.7::IImsRadio/imsradio1 vendor.qti.hardware.radio.internal.deviceinfo hwbinder - 1.0 - - IDeviceInfo - deviceinfo - + @1.0::IDeviceInfo/deviceinfo vendor.qti.hardware.radio.lpa hwbinder - 1.2 - - IUimLpa - UimLpa0 - UimLpa1 - + @1.2::IUimLpa/UimLpa0 + @1.2::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.7 - - IQtiRadio - slot1 - slot2 - + @2.7::IQtiRadio/slot1 + @2.7::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.trustedui @@ -483,86 +288,44 @@ vendor.qti.hardware.tui_comm hwbinder - 1.0 - - ITuiComm - default - + @1.0::ITuiComm/default vendor.qti.hardware.vpp hwbinder - 2.0 - - IHidlVppService - vppService - + @2.0::IHidlVppService/vppService vendor.qti.hardware.wifi.wifilearner hwbinder - 1.0 - - IWifiStats - wifiStats - + @1.0::IWifiStats/wifiStats 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.ims.factory hwbinder - 1.1 - - IImsFactory - default - + @1.1::IImsFactory/default vendor.qti.imsrtpservice hwbinder - 3.0 - - IRTPService - imsrtpservice - + @3.0::IRTPService/imsrtpservice vendor.qti.qspmhal hwbinder - 1.0 - - IQspmhal - default - @1.0::IQspmhal/default diff --git a/manifest_nfc.xml b/manifest_nfc.xml index db6ddc3..0cf4c11 100644 --- a/manifest_nfc.xml +++ b/manifest_nfc.xml @@ -1,16 +1,12 @@ android.hardware.nfc hwbinder - 1.2 - - INfc - default - + @1.2::INfc/default