From 9715ce3e0547db5ce4530fabcecabd5742f7729b Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 14 May 2021 17:37:41 -0700
Subject: [PATCH] Update manifest_64.xml to match manifest.xml

Update manifest_64.xml for the following changes that were made to
manifest.xml:
I0babd05f17281406af10e4ea2435aca598910d36 Remove android.hardware.drm@1.0 HAL services
Iaafd526fc5a601f7e8189ec764399d99c660beb0 Replace the HIDL with AIDL for "android.hardware.memtrack"
I3f0d35647c0748d360b12d3be078d514f99d23d5 Update dumpstate HAL to V1.1
I9ba18473132f4bfa37a9fe2bbae4bb3dc015cc0e gs101: Remove sensor HAL 1.0 config

Bug: 188239794
Test: m out/target/product/oriole/obj/PACKAGING/check_vintf_all_intermediates/check_vintf_compatible.log
Change-Id: I92c313f7f31df7193ca8c67f56cd9f1317290948
---
 manifest_64.xml | 37 +------------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/manifest_64.xml b/manifest_64.xml
index 17069085..cdf30745 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -53,15 +53,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.memtrack</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IMemtrack</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.renderscript</name>
         <transport arch="32+64">passthrough</transport>
@@ -71,27 +62,10 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.drm</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ICryptoFactory</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IDrmFactory</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.3::ICryptoFactory/clearkey</fqname>
-        <fqname>@1.3::IDrmFactory/clearkey</fqname>
-        <fqname>@1.3::ICryptoFactory/widevine</fqname>
-        <fqname>@1.3::IDrmFactory/widevine</fqname>
-    </hal>
     <hal format = "hidl">
         <name>android.hardware.dumpstate</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>IDumpstateDevice</name>
             <instance>default</instance>
@@ -120,15 +94,6 @@
         <transport>hwbinder</transport>
         <fqname>@1.2::IBootControl/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.sensors</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISensors</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 <!--
     <hal format="hidl">
         <name>android.hardware.neuralnetworks</name>