Skip to content

Commit d9b199c

Browse files
Vinay Vermadanascape
authored andcommitted
billie: Add support for qva manifest in lito
Co-authored-by: danascape <[email protected]> Change-Id: Ie641412fc7da4f3d6e2785449b67e59731bd0c4e
1 parent 4b3ed12 commit d9b199c

5 files changed

+131
-303
lines changed

BoardConfig.mk

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs
117117
DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml
118118
DEVICE_MATRIX_FILE := $(DEVICE_PATH)/compatibility_matrix.xml
119119

120+
ODM_MANIFEST_FILES := $(DEVICE_PATH)/manifest-qva.xml
120121
ODM_MANIFEST_2_FILES := $(DEVICE_PATH)/manifest_2.xml
121122
ODM_MANIFEST_8_FILES := $(DEVICE_PATH)/manifest_8.xml
122123
ODM_MANIFEST_10_FILES := $(DEVICE_PATH)/manifest_10.xml

manifest-qva.xml

+130
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
<!-- Copyright (c) 2020, The Linux Foundation. All rights reserved.
2+
3+
Redistribution and use in source and binary forms, with or without
4+
modification, are permitted provided that the following conditions are
5+
met:
6+
* Redistributions of source code must retain the above copyright
7+
notice, this list of conditions and the following disclaimer.
8+
* Redistributions in binary form must reproduce the above
9+
copyright notice, this list of conditions and the following
10+
disclaimer in the documentation and/or other materials provided
11+
with the distribution.
12+
* Neither the name of The Linux Foundation nor the names of its
13+
contributors may be used to endorse or promote products derived
14+
from this software without specific prior written permission.
15+
16+
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
17+
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
19+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
20+
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
23+
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24+
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
25+
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
26+
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27+
-->
28+
<manifest version="1.0" type="device">
29+
<hal format="hidl">
30+
<name>android.hardware.drm</name>
31+
<transport>hwbinder</transport>
32+
<fqname>@1.3::ICryptoFactory/wfdhdcp</fqname>
33+
<fqname>@1.3::IDrmFactory/wfdhdcp</fqname>
34+
</hal>
35+
<hal format="hidl" override="true">
36+
<name>android.hardware.keymaster</name>
37+
<transport>hwbinder</transport>
38+
<version>4.0</version>
39+
<interface>
40+
<name>IKeymasterDevice</name>
41+
<instance>default</instance>
42+
</interface>
43+
<fqname>@4.0::IKeymasterDevice/default</fqname>
44+
</hal>
45+
<hal format="hidl">
46+
<name>com.dsi.ant</name>
47+
<transport>hwbinder</transport>
48+
<version>1.0</version>
49+
<interface>
50+
<name>IAnt</name>
51+
<instance>default</instance>
52+
</interface>
53+
<fqname>@1.0::IAnt/default</fqname>
54+
</hal>
55+
<hal format="hidl">
56+
<name>com.qualcomm.qti.dpm.api</name>
57+
<transport>hwbinder</transport>
58+
<version>1.0</version>
59+
<interface>
60+
<name>IdpmQmi</name>
61+
<instance>dpmQmiService</instance>
62+
</interface>
63+
<fqname>@1.0::IdpmQmi/dpmQmiService</fqname>
64+
</hal>
65+
<hal format="hidl">
66+
<name>vendor.qti.hardware.bluetooth_audio</name>
67+
<transport>hwbinder</transport>
68+
<version>2.0</version>
69+
<interface>
70+
<name>IBluetoothAudioProvidersFactory</name>
71+
<instance>default</instance>
72+
</interface>
73+
<fqname>@2.0::IBluetoothAudioProvidersFactory/default</fqname>
74+
</hal>
75+
<hal format="hidl">
76+
<name>vendor.qti.hardware.btconfigstore</name>
77+
<transport>hwbinder</transport>
78+
<version>2.0</version>
79+
<interface>
80+
<name>IBTConfigStore</name>
81+
<instance>default</instance>
82+
</interface>
83+
<fqname>@2.0::IBTConfigStore/default</fqname>
84+
</hal>
85+
<hal format="hidl">
86+
<name>vendor.qti.hardware.data.latency</name>
87+
<transport>hwbinder</transport>
88+
<version>1.0</version>
89+
<interface>
90+
<name>ILinkLatency</name>
91+
<instance>default</instance>
92+
</interface>
93+
<fqname>@1.0::ILinkLatency/default</fqname>
94+
</hal>
95+
<hal format="hidl">
96+
<name>vendor.qti.hardware.fm</name>
97+
<transport>hwbinder</transport>
98+
<version>1.0</version>
99+
<interface>
100+
<name>IFmHci</name>
101+
<instance>default</instance>
102+
</interface>
103+
<fqname>@1.0::IFmHci/default</fqname>
104+
</hal>
105+
<hal format="hidl">
106+
<name>vendor.qti.hardware.wifidisplaysession</name>
107+
<transport>hwbinder</transport>
108+
<version>1.0</version>
109+
<interface>
110+
<name>IWifiDisplaySession</name>
111+
<instance>wifidisplaysession</instance>
112+
</interface>
113+
<interface>
114+
<name>IWifiDisplaySessionAudioTrack</name>
115+
<instance>wifidisplaysessionaudiotrack</instance>
116+
</interface>
117+
<interface>
118+
<name>IWifiDisplaySessionImageTrack</name>
119+
<instance>wifidisplaysessionimagetrack</instance>
120+
</interface>
121+
<interface>
122+
<name>IWifiDisplaySessionVideoTrack</name>
123+
<instance>wifidisplaysessionvideotrack</instance>
124+
</interface>
125+
<fqname>@1.0::IWifiDisplaySession/wifidisplaysession</fqname>
126+
<fqname>@1.0::IWifiDisplaySessionAudioTrack/wifidisplaysessionaudiotrack</fqname>
127+
<fqname>@1.0::IWifiDisplaySessionImageTrack/wifidisplaysessionimagetrack</fqname>
128+
<fqname>@1.0::IWifiDisplaySessionVideoTrack/wifidisplaysessionvideotrack</fqname>
129+
</hal>
130+
</manifest>

manifest_10.xml

-101
Original file line numberDiff line numberDiff line change
@@ -147,105 +147,4 @@
147147
<instance>slot2</instance>
148148
</interface>
149149
</hal>
150-
<hal format="hidl">
151-
<name>android.hardware.drm</name>
152-
<transport>hwbinder</transport>
153-
<fqname>@1.3::ICryptoFactory/wfdhdcp</fqname>
154-
<fqname>@1.3::IDrmFactory/wfdhdcp</fqname>
155-
</hal>
156-
<hal format="hidl" override="true">
157-
<name>android.hardware.keymaster</name>
158-
<transport>hwbinder</transport>
159-
<version>4.0</version>
160-
<interface>
161-
<name>IKeymasterDevice</name>
162-
<instance>default</instance>
163-
</interface>
164-
<fqname>@4.0::IKeymasterDevice/default</fqname>
165-
</hal>
166-
<hal format="hidl">
167-
<name>com.dsi.ant</name>
168-
<transport>hwbinder</transport>
169-
<version>1.0</version>
170-
<interface>
171-
<name>IAnt</name>
172-
<instance>default</instance>
173-
</interface>
174-
<fqname>@1.0::IAnt/default</fqname>
175-
</hal>
176-
<hal format="hidl">
177-
<name>com.qualcomm.qti.dpm.api</name>
178-
<transport>hwbinder</transport>
179-
<version>1.0</version>
180-
<interface>
181-
<name>IdpmQmi</name>
182-
<instance>dpmQmiService</instance>
183-
</interface>
184-
<fqname>@1.0::IdpmQmi/dpmQmiService</fqname>
185-
</hal>
186-
<hal format="hidl">
187-
<name>vendor.qti.hardware.bluetooth_audio</name>
188-
<transport>hwbinder</transport>
189-
<version>2.0</version>
190-
<interface>
191-
<name>IBluetoothAudioProvidersFactory</name>
192-
<instance>default</instance>
193-
</interface>
194-
<fqname>@2.0::IBluetoothAudioProvidersFactory/default</fqname>
195-
</hal>
196-
<hal format="hidl">
197-
<name>vendor.qti.hardware.btconfigstore</name>
198-
<transport>hwbinder</transport>
199-
<version>2.0</version>
200-
<interface>
201-
<name>IBTConfigStore</name>
202-
<instance>default</instance>
203-
</interface>
204-
<fqname>@2.0::IBTConfigStore/default</fqname>
205-
</hal>
206-
<hal format="hidl">
207-
<name>vendor.qti.hardware.data.latency</name>
208-
<transport>hwbinder</transport>
209-
<version>1.0</version>
210-
<interface>
211-
<name>ILinkLatency</name>
212-
<instance>default</instance>
213-
</interface>
214-
<fqname>@1.0::ILinkLatency/default</fqname>
215-
</hal>
216-
<hal format="hidl">
217-
<name>vendor.qti.hardware.fm</name>
218-
<transport>hwbinder</transport>
219-
<version>1.0</version>
220-
<interface>
221-
<name>IFmHci</name>
222-
<instance>default</instance>
223-
</interface>
224-
<fqname>@1.0::IFmHci/default</fqname>
225-
</hal>
226-
<hal format="hidl">
227-
<name>vendor.qti.hardware.wifidisplaysession</name>
228-
<transport>hwbinder</transport>
229-
<version>1.0</version>
230-
<interface>
231-
<name>IWifiDisplaySession</name>
232-
<instance>wifidisplaysession</instance>
233-
</interface>
234-
<interface>
235-
<name>IWifiDisplaySessionAudioTrack</name>
236-
<instance>wifidisplaysessionaudiotrack</instance>
237-
</interface>
238-
<interface>
239-
<name>IWifiDisplaySessionImageTrack</name>
240-
<instance>wifidisplaysessionimagetrack</instance>
241-
</interface>
242-
<interface>
243-
<name>IWifiDisplaySessionVideoTrack</name>
244-
<instance>wifidisplaysessionvideotrack</instance>
245-
</interface>
246-
<fqname>@1.0::IWifiDisplaySession/wifidisplaysession</fqname>
247-
<fqname>@1.0::IWifiDisplaySessionAudioTrack/wifidisplaysessionaudiotrack</fqname>
248-
<fqname>@1.0::IWifiDisplaySessionImageTrack/wifidisplaysessionimagetrack</fqname>
249-
<fqname>@1.0::IWifiDisplaySessionVideoTrack/wifidisplaysessionvideotrack</fqname>
250-
</hal>
251150
</manifest>

manifest_2.xml

-101
Original file line numberDiff line numberDiff line change
@@ -147,105 +147,4 @@
147147
<instance>slot2</instance>
148148
</interface>
149149
</hal>
150-
<hal format="hidl">
151-
<name>android.hardware.drm</name>
152-
<transport>hwbinder</transport>
153-
<fqname>@1.3::ICryptoFactory/wfdhdcp</fqname>
154-
<fqname>@1.3::IDrmFactory/wfdhdcp</fqname>
155-
</hal>
156-
<hal format="hidl" override="true">
157-
<name>android.hardware.keymaster</name>
158-
<transport>hwbinder</transport>
159-
<version>4.0</version>
160-
<interface>
161-
<name>IKeymasterDevice</name>
162-
<instance>default</instance>
163-
</interface>
164-
<fqname>@4.0::IKeymasterDevice/default</fqname>
165-
</hal>
166-
<hal format="hidl">
167-
<name>com.dsi.ant</name>
168-
<transport>hwbinder</transport>
169-
<version>1.0</version>
170-
<interface>
171-
<name>IAnt</name>
172-
<instance>default</instance>
173-
</interface>
174-
<fqname>@1.0::IAnt/default</fqname>
175-
</hal>
176-
<hal format="hidl">
177-
<name>com.qualcomm.qti.dpm.api</name>
178-
<transport>hwbinder</transport>
179-
<version>1.0</version>
180-
<interface>
181-
<name>IdpmQmi</name>
182-
<instance>dpmQmiService</instance>
183-
</interface>
184-
<fqname>@1.0::IdpmQmi/dpmQmiService</fqname>
185-
</hal>
186-
<hal format="hidl">
187-
<name>vendor.qti.hardware.bluetooth_audio</name>
188-
<transport>hwbinder</transport>
189-
<version>2.0</version>
190-
<interface>
191-
<name>IBluetoothAudioProvidersFactory</name>
192-
<instance>default</instance>
193-
</interface>
194-
<fqname>@2.0::IBluetoothAudioProvidersFactory/default</fqname>
195-
</hal>
196-
<hal format="hidl">
197-
<name>vendor.qti.hardware.btconfigstore</name>
198-
<transport>hwbinder</transport>
199-
<version>2.0</version>
200-
<interface>
201-
<name>IBTConfigStore</name>
202-
<instance>default</instance>
203-
</interface>
204-
<fqname>@2.0::IBTConfigStore/default</fqname>
205-
</hal>
206-
<hal format="hidl">
207-
<name>vendor.qti.hardware.data.latency</name>
208-
<transport>hwbinder</transport>
209-
<version>1.0</version>
210-
<interface>
211-
<name>ILinkLatency</name>
212-
<instance>default</instance>
213-
</interface>
214-
<fqname>@1.0::ILinkLatency/default</fqname>
215-
</hal>
216-
<hal format="hidl">
217-
<name>vendor.qti.hardware.fm</name>
218-
<transport>hwbinder</transport>
219-
<version>1.0</version>
220-
<interface>
221-
<name>IFmHci</name>
222-
<instance>default</instance>
223-
</interface>
224-
<fqname>@1.0::IFmHci/default</fqname>
225-
</hal>
226-
<hal format="hidl">
227-
<name>vendor.qti.hardware.wifidisplaysession</name>
228-
<transport>hwbinder</transport>
229-
<version>1.0</version>
230-
<interface>
231-
<name>IWifiDisplaySession</name>
232-
<instance>wifidisplaysession</instance>
233-
</interface>
234-
<interface>
235-
<name>IWifiDisplaySessionAudioTrack</name>
236-
<instance>wifidisplaysessionaudiotrack</instance>
237-
</interface>
238-
<interface>
239-
<name>IWifiDisplaySessionImageTrack</name>
240-
<instance>wifidisplaysessionimagetrack</instance>
241-
</interface>
242-
<interface>
243-
<name>IWifiDisplaySessionVideoTrack</name>
244-
<instance>wifidisplaysessionvideotrack</instance>
245-
</interface>
246-
<fqname>@1.0::IWifiDisplaySession/wifidisplaysession</fqname>
247-
<fqname>@1.0::IWifiDisplaySessionAudioTrack/wifidisplaysessionaudiotrack</fqname>
248-
<fqname>@1.0::IWifiDisplaySessionImageTrack/wifidisplaysessionimagetrack</fqname>
249-
<fqname>@1.0::IWifiDisplaySessionVideoTrack/wifidisplaysessionvideotrack</fqname>
250-
</hal>
251150
</manifest>

0 commit comments

Comments
 (0)