From 15351dcf60179cc23d126f7699a0832276acd2ea Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Tue, 14 Apr 2020 14:18:30 -0700
Subject: [PATCH] Use <fqname> to avoid conflicts

The newer way of specifying the interface is using <fqname> and it also
has the handy side-effect of not causing conflicts when we add the
strongbox implementation to devices.

Test: make # check $OUT for the correct manifest
Change-Id: If8333814723261c4f3de375861ee19a6d922d55f
---
 .../4.0/android.hardware.keymaster@4.0-service.trusty.xml   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/trusty/keymaster/4.0/android.hardware.keymaster@4.0-service.trusty.xml b/trusty/keymaster/4.0/android.hardware.keymaster@4.0-service.trusty.xml
index aa30707ca..65eb8549a 100644
--- a/trusty/keymaster/4.0/android.hardware.keymaster@4.0-service.trusty.xml
+++ b/trusty/keymaster/4.0/android.hardware.keymaster@4.0-service.trusty.xml
@@ -2,10 +2,6 @@
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-        <name>IKeymasterDevice</name>
-            <instance>default</instance>
-        </interface>
+        <fqname>@4.0::IKeymasterDevice/default</fqname>
     </hal>
 </manifest>