summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorNicholas Sauer <nicksauer@google.com>2018-06-15 20:53:16 -0700
committerNicholas Sauer <nicksauer@google.com>2018-06-16 03:57:38 +0000
commit50df84d185a74e0a5add3f408cfb68de9e05ae80 (patch)
tree69b5b88a3ccc3b99913990aaa2e67589aa9d57e4 /common
parent6f3ae29a9d8be05b812cbfde5b04c15d9356bf4d (diff)
downloadcar-50df84d185a74e0a5add3f408cfb68de9e05ae80.tar.gz
Fix car manifest.xml
Add instance 'default' for keymaster4.0 Sync manifest.xml to goldfish manifest.xml Fixes: 110265540 Test: lunch gcar_emu_x86-userdebug && m && emulator Change-Id: I434961aa73de2e8e17fd31baf75f36f2f07b4b96
Diffstat (limited to 'common')
-rw-r--r--common/manifest.xml43
1 files changed, 32 insertions, 11 deletions
diff --git a/common/manifest.xml b/common/manifest.xml
index f27e715..fb51a5f 100644
--- a/common/manifest.xml
+++ b/common/manifest.xml
@@ -7,22 +7,15 @@
<interface>
<name>ICryptoFactory</name>
<instance>default</instance>
- <instance>widevine</instance>
</interface>
<interface>
<name>IDrmFactory</name>
<instance>default</instance>
- <instance>widevine</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.soundtrigger</name>
- <transport>hwbinder</transport>
- <version>2.0</version>
- <interface>
- <name>ISoundTriggerHw</name>
- <instance>default</instance>
</interface>
+ <fqname>@1.1::ICryptoFactory/clearkey</fqname>
+ <fqname>@1.1::IDrmFactory/clearkey</fqname>
+ <fqname>@1.1::ICryptoFactory/widevine</fqname>
+ <fqname>@1.1::IDrmFactory/widevine</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.audio.effect</name>
@@ -70,6 +63,16 @@
</interface>
</hal>
<hal format="hidl">
+ <name>android.hardware.keymaster</name>
+ <transport>hwbinder</transport>
+ <version>4.0</version>
+ <interface>
+ <name>IKeymasterDevice</name>
+ <instance>default</instance>
+ <instance>strongbox</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
<name>android.hardware.graphics.allocator</name>
<transport>hwbinder</transport>
<version>2.0</version>
@@ -191,6 +194,15 @@
</interface>
</hal>
<hal format="hidl">
+ <name>android.hardware.wifi.hostapd</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IHostapd</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
<name>android.hardware.wifi.supplicant</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -200,6 +212,15 @@
</interface>
</hal>
<hal format="hidl">
+ <name>android.hardware.cas</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IMediaCasService</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
<name>android.hardware.automotive.vehicle</name>
<transport>hwbinder</transport>
<version>2.0</version>