From 1fa8bf58855fc3fb7fa527c6bcd0f95fef394152 Mon Sep 17 00:00:00 2001 From: Devika Krishnadas Date: Mon, 26 Feb 2024 17:58:11 +0000 Subject: [PATCH 1/4] Move Gralloc packages to gs-common Bug: 275906497 Test: Boot succeeds Change-Id: I879a5ef8365abe018c501cdb0b06c9753e0e5902 Signed-off-by: Devika Krishnadas --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index e3818ced..db280183 100644 --- a/device.mk +++ b/device.mk @@ -546,10 +546,6 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000 PRODUCT_PACKAGES += \ com.android.future.usb.accessory -PRODUCT_PACKAGES += \ - android.hardware.graphics.mapper@4.0-impl \ - android.hardware.graphics.allocator-V1-service - PRODUCT_PACKAGES += \ android.hardware.memtrack-service.pixel \ libion_exynos \ From d19f4e8c9561c324fadeb86ae7a0ab23abea761f Mon Sep 17 00:00:00 2001 From: Sungtak Lee Date: Tue, 27 Feb 2024 17:28:23 +0000 Subject: [PATCH 2/4] Add media.c2 aidl fragments Bug: 321808716 Change-Id: I0540df5a15d2186f511fac64de195f7656a78e3d --- manifest_media.xml | 12 ++++++++++++ manifest_media_aosp.xml | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/manifest_media.xml b/manifest_media.xml index 195d587b..d3692477 100644 --- a/manifest_media.xml +++ b/manifest_media.xml @@ -1,4 +1,5 @@ + android.hardware.media.c2 hwbinder @@ -9,4 +10,15 @@ default1 + + + android.hardware.media.c2 + 1 + IComponentStore/default1 + + + android.hardware.media.c2 + 1 + IComponentStore/default + diff --git a/manifest_media_aosp.xml b/manifest_media_aosp.xml index 9a1a3dba..2d1888be 100644 --- a/manifest_media_aosp.xml +++ b/manifest_media_aosp.xml @@ -1,4 +1,5 @@ + android.hardware.media.c2 hwbinder @@ -8,4 +9,10 @@ default + + + android.hardware.media.c2 + 1 + IComponentStore/default + From 47cbecc736d01b8c7f5ba2cc75136f3512ffe429 Mon Sep 17 00:00:00 2001 From: Mark Chang Date: Wed, 28 Feb 2024 13:37:07 +0000 Subject: [PATCH 3/4] Add sepolicy include to zuma. Bug: 325422902 Test: Manual, system booted without sepolicy denied error. Change-Id: Ibbf4fd4f0eab82589915933d5c298839bc0c7f01 Signed-off-by: Mark Chang --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 5c62c2e2..cf1dfdad 100644 --- a/device.mk +++ b/device.mk @@ -1182,8 +1182,8 @@ include device/google/gs-common/pixel_ril/ril.mk endif # Touch service -include hardware/google/pixel/input/twoshay.mk include device/google/gs-common/touch/twoshay/aidl_zuma.mk +include device/google/gs-common/touch/twoshay/twoshay.mk # Allow longer timeout for incident report generation in bugreport # Overriding in /product partition instead of /vendor intentionally, From fe980182cc8f21d7af154271d58aff971f72132c Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Tue, 5 Mar 2024 00:55:40 +0000 Subject: [PATCH 4/4] Revert "Add betterbug mk to zuma" Revert submission 26348985-bb-sepolicy-poc Reason for revert: Droidfood blocking bug: b/327991669 Bug: b/327991669 Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc Change-Id: I83de6f389e4ce5113afd751871e0e10e67fb0b4f --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 4c1b246a..fdf33fa8 100644 --- a/device.mk +++ b/device.mk @@ -42,7 +42,6 @@ include device/google/gs-common/sota_app/factoryota.mk include device/google/gs-common/misc_writer/misc_writer.mk include device/google/gs-common/gyotaku_app/gyotaku.mk include device/google/gs-common/bootctrl/bootctrl_aidl.mk -include device/google/gs-common/betterbug/betterbug.mk include device/google/zuma/dumpstate/item.mk