commit d1fc766d4d483119b44c5d41c21d0149403e69ce
author Yifan Hong <elsk@google.com> Wed Mar 14 14:17:30 2018 -0700
committer Steven Moreland <smoreland@google.com> Tue Mar 20 01:22:21 2018 +0000
tree 237f5d134309dada5d85bd1a45f3b7bbec6161b3
parent d4945911233151030fcd2bfd55be1f5eeb464a26

Remove drm@1.1::I*/default and widevine from the manifest.

1.1 clearkey is kept using the old format so that OTA
still works (otherwise, the old libvintf on the device
won't be able to see that 1.1 clearkey is on the device,
and will fail OTA.)

Use the latest <fqname> syntax.

Test: build device
Test: lshal
Test: play Google Play videos
Test: vts_treble_vintf_test DRM passes
Bug: 73556059

Change-Id: I7ef58838dbff0e28e55de2a9e9404571d2006af6

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 5745cb1..2c00afc 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -86,16 +86,16 @@
         <version>1.1</version>
         <interface>
             <name>ICryptoFactory</name>
-            <instance>default</instance>
-            <instance>widevine</instance>
             <instance>clearkey</instance>
         </interface>
         <interface>
             <name>IDrmFactory</name>
-            <instance>default</instance>
-            <instance>widevine</instance>
             <instance>clearkey</instance>
         </interface>
+        <fqname>@1.0::ICryptoFactory/default</fqname>
+        <fqname>@1.0::IDrmFactory/default</fqname>
+        <fqname>@1.0::ICryptoFactory/widevine</fqname>
+        <fqname>@1.0::IDrmFactory/widevine</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.dumpstate</name>