From cab7449ac8bdaec50055c0ea6ebb261391a3543a Mon Sep 17 00:00:00 2001
From: Matthew Maurer <mmaurer@google.com>
Date: Mon, 10 Jun 2019 16:46:40 -0700
Subject: Remove conflicting Gatekeeper declaration

This is now provided by the VINTF in the rest of the gatekeeper changes.

Change-Id: Icd55270b6a31153f90f24c7ea258630d01618e10
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'manifest.xml')

diff --git a/manifest.xml b/manifest.xml
index c0893a2..01ded6e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -124,15 +124,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.gatekeeper</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IGatekeeper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.gnss</name>
         <transport>hwbinder</transport>
-- 
cgit v1.2.3


From 6ec798bc61860dcab28074e785f04af3fd3f9b45 Mon Sep 17 00:00:00 2001
From: Ahmed ElArabawy <arabawy@google.com>
Date: Tue, 24 Sep 2019 09:54:45 -0700
Subject: Wifi: Remove IWifi hidl entry from manifest.xml

This CL removes the definition for the IWifi hidl interface from
manifest.xml and rely on vint-fragements entry.
This is to avoid the need to modify the revision in future

Bug: 138243400
Test: builds and wifi works
Change-Id: I359136514897c5f37d2c045cfedacdba46fa5d3c
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'manifest.xml')

diff --git a/manifest.xml b/manifest.xml
index 8c39798..c08a789 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -146,15 +146,6 @@
             <instance>slot1</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.wifi</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IWifi</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.wifi.hostapd</name>
         <transport>hwbinder</transport>
-- 
cgit v1.2.3


From 1a56a68656c915f3ec22a3954268110ff95136fd Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jimmycmchen@google.com>
Date: Fri, 27 Sep 2019 14:45:44 +0800
Subject: wifi: move wpa_supplicant VINTF definition to wpa_supplicant module

Bug: 36505680
Test: builds and wifi works
Change-Id: I5ada1546d817b26ebea3834c178aeed705992583
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'manifest.xml')

diff --git a/manifest.xml b/manifest.xml
index c08a789..3be26bf 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -155,15 +155,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.wifi.supplicant</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISupplicant</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.health</name>
         <transport>hwbinder</transport>
-- 
cgit v1.2.3


From bdd6648aa3d355261d1fd56efb4ffc5c9cfd502c Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Wed, 23 Oct 2019 14:24:46 -0700
Subject: Add Widevine L3 drm service to cuttlefish

In adding Widevine L3 drm service to cuttlefish,
we have moved the open code Widevine fqname reference
to vendor/widevine. Remove duplicate code in device
manifest.xml.

Test: Build successfully
Test: suggestion: Play Movies & TV, Netflix and Exoplayer
Test: suggestion: GTS L1 tests

bug: 141621537
Change-Id: Ia95db4c18170b81111d4350b677d80932cd1eaba
---
 manifest.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'manifest.xml')

diff --git a/manifest.xml b/manifest.xml
index 3be26bf..980052b 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -13,8 +13,6 @@
         </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>
-- 
cgit v1.2.3


From 54f885187a23004872935250b07fbc000434c323 Mon Sep 17 00:00:00 2001
From: lesl <lesl@google.com>
Date: Fri, 6 Dec 2019 19:01:26 +0800
Subject: Wifi: Remove hostapd hidl entry from manifest.xml

This CL removes the definition for the hostapd hidl interface from
manifest.xml and rely on vint-fragements entry.
This is to avoid the need to modify the revision in future

Bug: 145780363
Test: builds and wifi softap works
Change-Id: I9a48a981ebac464bd623e7c5a7a7e93f2349c226
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'manifest.xml')

diff --git a/manifest.xml b/manifest.xml
index 980052b..dfb99bd 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -144,15 +144,6 @@
             <instance>slot1</instance>
         </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.health</name>
         <transport>hwbinder</transport>
-- 
cgit v1.2.3


From 2f9458fc9dc85dce41aaf9435199d7f091c3ce02 Mon Sep 17 00:00:00 2001
From: Tomasz Wasilczyk <twasilczyk@google.com>
Date: Wed, 18 Dec 2019 12:34:19 -0800
Subject: Remove broadcastradio HAL 1.x from emulator targets

Bug: 146456245
Test: gcar emulator boots now
Change-Id: Iba1bfb8d84d05d00f7dbc49f050ec7a42084c75b
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'manifest.xml')

diff --git a/manifest.xml b/manifest.xml
index dfb99bd..d3cbdb2 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -86,15 +86,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.broadcastradio</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IBroadcastRadioFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.camera.provider</name>
         <transport>hwbinder</transport>
-- 
cgit v1.2.3