commit 88cde068bc799c4d955653fd2b92b2fbe86305e8
author Jason Macnak <natsu@google.com> Fri Oct 01 09:08:49 2021 -0700
committer Jason Macnak <natsu@google.com> Fri Oct 01 15:20:03 2021 -0700
tree ab7bad605aa48b5e8b33c421dddbeaf05bbc3ae3
parent 6d8f791e21d5fbb13d884212f59a76a493679b13

Remove hwcomposer manifest snippet to avoid conflict

... now that hwcomposer uses vintf fragments.

Updates FVP to 2.3 to match the other goldfish builds.

Bug: b/201578179
Test: presubmit
Change-Id: I6c099161fbc80ba8eb8a4ef1dd80ebed1eefc9ef

64bitonly/manifest.xml

diff --git a/64bitonly/manifest.xml b/64bitonly/manifest.xml
index 7d589d6..9ca42d1 100644
--- a/64bitonly/manifest.xml
+++ b/64bitonly/manifest.xml
@@ -60,15 +60,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.graphics.composer</name>
-        <transport>hwbinder</transport>
-        <version>2.3</version>
-        <interface>
-            <name>IComposer</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.media.c2</name>
         <transport>hwbinder</transport>
         <version>1.1</version>

fvp.mk

diff --git a/fvp.mk b/fvp.mk
index fbddf7f..bbd6556 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -56,8 +56,8 @@
     android.hardware.gatekeeper@1.0-service.software \
     android.hardware.graphics.allocator@2.0-service \
     android.hardware.graphics.allocator@2.0-impl \
-    android.hardware.graphics.composer@2.1-service \
-    android.hardware.graphics.composer@2.1-impl \
+    android.hardware.graphics.composer@2.3-service \
+    android.hardware.graphics.composer@2.3-impl \
     android.hardware.graphics.mapper@2.0-impl \
     android.hardware.health@2.0-service \
     android.hardware.neuralnetworks@1.3-service-sample-all \

fvpbase/manifest.xml

diff --git a/fvpbase/manifest.xml b/fvpbase/manifest.xml
index f88e377..6bd6654 100644
--- a/fvpbase/manifest.xml
+++ b/fvpbase/manifest.xml
@@ -51,15 +51,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.graphics.composer</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IComposer</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
         <version>2.0</version>

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 94b44c3..ed8b031 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -60,15 +60,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.graphics.composer</name>
-        <transport>hwbinder</transport>
-        <version>2.3</version>
-        <interface>
-            <name>IComposer</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.media.c2</name>
         <transport>hwbinder</transport>
         <version>1.0</version>