Revert old matrices back to DR / MR1.

legacy/26/27.xml ("old matrices") should not be changed once
published.

The requirements / HAL usage information are now encompassed in
multiple matrices (instead of a single compatibility_matrix.V.xml).
For example, the usage of HALs on Shipping FCM Version 26 is:
* Required HALs in 26.xml
* Using all required + optional HALs in 26.xml/27.xml/...

In particular,

* Starting at 26.xml (diff legacy 26), gatekeeper is required.
* Starting at 27.xml (diff 26 27),
   - broadcastradio@1.0 => 1.0-1
   - introduce cas@1.0
   - introduce oemlock@1.0
   - power@1.0 => 1.0-1
   - radio@1.0 => 1.0-1
   - introduce tetheroffload.config@1.0
   - introduce tetheroffload.control@1.0
   - thermal@1.0 => 1.0-1
   - usb@1.0 => 1.0-1
   - vibrator@1.0 => 1.0-1
   - wifi@1.0 => 1.0-1
   - introduce weaver@1.0
   - introduce wifi.offload@1.0

health@2.0 and configstore@1.1 is not specified
in legacy/26/27.xml, but framework can still use them, since they
are introduced in current.xml.

Test: boot test

Bug: 69861676
Change-Id: I897df6952245a8ce33e1c63264c3970b0483c2f7
Merged-In: I897df6952245a8ce33e1c63264c3970b0483c2f7
This commit is contained in:
Yifan Hong
2017-12-11 15:58:47 -08:00
parent e514a4b8a8
commit 48952110c7
2 changed files with 14 additions and 110 deletions

View File

@@ -57,7 +57,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.broadcastradio</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IBroadcastRadioFactory</name>
<instance>default</instance>
@@ -71,14 +71,6 @@
<instance>legacy/0</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.cas</name>
<version>1.0</version>
<interface>
<name>IMediaCasService</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.configstore</name>
<version>1.0</version>
@@ -211,17 +203,9 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.oemlock</name>
<version>1.0</version>
<interface>
<name>IOemLock</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.power</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IPower</name>
<instance>default</instance>
@@ -229,7 +213,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.radio</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IRadio</name>
<instance>slot1</instance>
@@ -271,25 +255,9 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.tetheroffload.config</name>
<version>1.0</version>
<interface>
<name>IOffloadConfig</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.tetheroffload.control</name>
<version>1.0</version>
<interface>
<name>IOffloadControl</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.thermal</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IThermal</name>
<instance>default</instance>
@@ -313,7 +281,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.usb</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IUsb</name>
<instance>default</instance>
@@ -321,7 +289,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.vibrator</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IVibrator</name>
<instance>default</instance>
@@ -335,30 +303,14 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.weaver</name>
<version>1.0</version>
<interface>
<name>IWeaver</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.wifi</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IWifi</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.wifi.offload</name>
<version>1.0</version>
<interface>
<name>IOffload</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.wifi.supplicant</name>
<version>1.0</version>

View File

@@ -57,7 +57,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.broadcastradio</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IBroadcastRadioFactory</name>
<instance>default</instance>
@@ -71,14 +71,6 @@
<instance>legacy/0</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.cas</name>
<version>1.0</version>
<interface>
<name>IMediaCasService</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.configstore</name>
<version>1.0</version>
@@ -211,17 +203,9 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.oemlock</name>
<version>1.0</version>
<interface>
<name>IOemLock</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.power</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IPower</name>
<instance>default</instance>
@@ -229,7 +213,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.radio</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IRadio</name>
<instance>slot1</instance>
@@ -271,25 +255,9 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.tetheroffload.config</name>
<version>1.0</version>
<interface>
<name>IOffloadConfig</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.tetheroffload.control</name>
<version>1.0</version>
<interface>
<name>IOffloadControl</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.thermal</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IThermal</name>
<instance>default</instance>
@@ -313,7 +281,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.usb</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IUsb</name>
<instance>default</instance>
@@ -321,7 +289,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.vibrator</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IVibrator</name>
<instance>default</instance>
@@ -335,30 +303,14 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.weaver</name>
<version>1.0</version>
<interface>
<name>IWeaver</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.wifi</name>
<version>1.0-1</version>
<version>1.0</version>
<interface>
<name>IWifi</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.wifi.offload</name>
<version>1.0</version>
<interface>
<name>IOffload</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.wifi.supplicant</name>
<version>1.0</version>