diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-07-29 10:29:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-07-29 10:29:05 +0000 |
| commit | 260e05d375061f3866c7d88f2c03e4da84036755 (patch) | |
| tree | c5d80026722f045cfa731b597eabfc166f35420b | |
| parent | fecfd8ceaaa99102dd65153e75f0d0fa7e2f5b3e (diff) | |
| parent | 7ce68882dae37ea3d1976eae4be864be912f54cb (diff) | |
| download | goldfish-android12-gsi.tar.gz | |
Merge changes from topic "a12-gsi-fix-build-hwcomposer2.4" into android12-gsiandroid12-gsi
* changes:
Upgrade to hwcomposer 2.4
Remove hwcomposer manifest snippet to avoid conflict
| -rw-r--r-- | 64bitonly/manifest.xml | 9 | ||||
| -rw-r--r-- | 64bitonly/product/vendor.mk | 3 | ||||
| -rw-r--r-- | fvp.mk | 3 | ||||
| -rw-r--r-- | fvpbase/manifest.xml | 9 | ||||
| -rw-r--r-- | manifest.xml | 9 | ||||
| -rw-r--r-- | vendor.mk | 3 |
6 files changed, 3 insertions, 33 deletions
diff --git a/64bitonly/manifest.xml b/64bitonly/manifest.xml index f39a4ae7..9c815210 100644 --- a/64bitonly/manifest.xml +++ b/64bitonly/manifest.xml @@ -69,15 +69,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> diff --git a/64bitonly/product/vendor.mk b/64bitonly/product/vendor.mk index dc6c3f8e..2f5273f3 100644 --- a/64bitonly/product/vendor.mk +++ b/64bitonly/product/vendor.mk @@ -46,8 +46,7 @@ PRODUCT_PACKAGES += \ qemu-props \ stagefright \ fingerprint.ranchu \ - android.hardware.graphics.composer@2.3-impl \ - android.hardware.graphics.composer@2.3-service \ + android.hardware.graphics.composer@2.4-service \ android.hardware.graphics.allocator@3.0-service \ android.hardware.graphics.mapper@3.0-impl-ranchu \ hwcomposer.ranchu \ @@ -56,8 +56,7 @@ PRODUCT_PACKAGES += \ 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.4-service \ android.hardware.graphics.mapper@2.0-impl \ android.hardware.health@2.0-service \ android.hardware.keymaster@4.0-service \ diff --git a/fvpbase/manifest.xml b/fvpbase/manifest.xml index 51c7f933..08806b2d 100644 --- a/fvpbase/manifest.xml +++ b/fvpbase/manifest.xml @@ -69,15 +69,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> diff --git a/manifest.xml b/manifest.xml index 6f504a06..620f38ed 100644 --- a/manifest.xml +++ b/manifest.xml @@ -69,15 +69,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> @@ -46,8 +46,7 @@ PRODUCT_PACKAGES += \ qemu-props \ stagefright \ fingerprint.ranchu \ - android.hardware.graphics.composer@2.3-impl \ - android.hardware.graphics.composer@2.3-service \ + android.hardware.graphics.composer@2.4-service \ android.hardware.graphics.allocator@3.0-service \ android.hardware.graphics.mapper@3.0-impl-ranchu \ hwcomposer.ranchu \ |