From 7d695f4bff77b8b34f75150825d4ba5e141dcca2 Mon Sep 17 00:00:00 2001 From: Woody Lin Date: Sun, 5 Feb 2023 12:26:40 +0800 Subject: [PATCH 1/3] DO NOT MERGE: gs201: init.debug.rc: Enable etm/etm2dram when ramdump is enabled Bug: 265382296 Change-Id: Ib215551397a361f5734401173e62a15691e45425 --- conf/init.debug.rc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/init.debug.rc b/conf/init.debug.rc index 631bc28b..d98e9bc8 100644 --- a/conf/init.debug.rc +++ b/conf/init.debug.rc @@ -38,3 +38,8 @@ on post-fs-data chown bluetooth system /dev/logbuffer_btlpm chown bluetooth system /dev/logbuffer_btpower chown bluetooth system /dev/logbuffer_tty18 + +# Enable etm/etm2dram when ramdump is enabled. +on property:ro.boot.ramdump=enabled + write /sys/devices/platform/exynos-etm/etm_on 1 + write /sys/devices/platform/etm2dram/arm 1 From 63080f54524544d12f131b6b9f8e1fc63a2dbff8 Mon Sep 17 00:00:00 2001 From: Erik Staats Date: Wed, 8 Mar 2023 20:35:33 +0000 Subject: [PATCH 2/3] Add UmfwStat Bug: 272323547 Test: Verified UmfwStat tables are dumped in bug report. Change-Id: Ia2848a3893ce20a8bf02629e6ee4fbee6f8651fb --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 45b75a2d..e289cec7 100644 --- a/device.mk +++ b/device.mk @@ -24,6 +24,7 @@ include device/google/gs-common/thermal/thermal.mk include device/google/gs-common/pixel_metrics/pixel_metrics.mk include device/google/gs-common/performance/perf.mk include device/google/gs-common/display/dump.mk +include device/google/gs-common/umfw_stat/umfw_stat.mk TARGET_BOARD_PLATFORM := gs201 From e3457143756903222cd8c3ed639f1c924440b686 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Mon, 6 Mar 2023 13:50:37 +0800 Subject: [PATCH 3/3] audio: move audio hal hidl mk to gs-common. Bug: 259161622 Test: build pass and check audio function with HIDL service Change-Id: I4a72f00be1c9eafc92cab5ff7ef93a688f82eb75 Signed-off-by: Jasmine Cha --- device.mk | 58 +---------------------------- device_framework_matrix_product.xml | 16 -------- manifest-gralloc3.xml | 45 ---------------------- manifest.xml | 45 ---------------------- 4 files changed, 1 insertion(+), 163 deletions(-) diff --git a/device.mk b/device.mk index e289cec7..bb93cedc 100644 --- a/device.mk +++ b/device.mk @@ -1018,63 +1018,7 @@ PRODUCT_PACKAGES += \ # Audio # Audio HAL Server & Default Implementations -PRODUCT_PACKAGES += \ - android.hardware.audio.service \ - android.hardware.audio@7.1-impl \ - android.hardware.audio.effect@7.0-impl \ - android.hardware.soundtrigger@2.3-impl \ - vendor.google.whitechapel.audio.audioext@4.0-impl \ - android.hardware.bluetooth.audio-impl \ - -# -##Audio HAL libraries -PRODUCT_PACKAGES += \ - audio.primary.$(TARGET_BOARD_PLATFORM) \ - audio.platform.aoc \ - audio_tunnel_aoc \ - aoc_aud_ext \ - libaoctuningdecoder \ - liboffloadeffect \ - audio_bt_aoc \ - audio_waves_aoc \ - audio_fortemedia_aoc \ - audio_bluenote_aoc \ - audio_usb_aoc \ - audio_cca_aoc \ - libamcsextfile \ - audio_amcs_ext \ - audio.usb.default \ - audio.usbv2.default \ - audio.bluetooth.default \ - audio.r_submix.default \ - audio_spk_35l41 \ - sound_trigger.primary.$(TARGET_BOARD_PLATFORM) -# libaoc_waves \ -# - -##Audio Vendor libraries -PRODUCT_PACKAGES += \ - libfvsam_prm_parser \ - libmahalcontroller \ - libAlgFx_HiFi3z -# -## AudioHAL Configurations -PRODUCT_COPY_FILES += \ - frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration_7_0.xml \ - frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration_7_0.xml \ - frameworks/av/services/audiopolicy/config/hearing_aid_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hearing_aid_audio_policy_configuration_7_0.xml \ - frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ - frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml - -##Audio soong -PRODUCT_SOONG_NAMESPACES += \ - vendor/google/whitechapel/audio/hal \ - vendor/google/whitechapel/audio/interfaces - -$(call soong_config_set,aoc_audio_board,platform,$(TARGET_BOARD_PLATFORM)) +include device/google/gs-common/audio/hidl_gs201.mk ## AoC soong PRODUCT_SOONG_NAMESPACES += \ diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 6b11a847..5d6cf695 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -155,14 +155,6 @@ default - - vendor.google.whitechapel.audio.audioext - 4.0 - - IAudioExt - default - - vendor.google.wifi_ext 1 @@ -189,12 +181,4 @@ rilExternal - - vendor.google.audiometricext - 1.0 - - IAudioMetricExt - default - - diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml index 9ecea758..c890030c 100644 --- a/manifest-gralloc3.xml +++ b/manifest-gralloc3.xml @@ -1,31 +1,4 @@ - - android.hardware.audio - hwbinder - 7.1 - - IDevicesFactory - default - - - - android.hardware.audio.effect - hwbinder - 7.0 - - IEffectsFactory - default - - - - android.hardware.soundtrigger - hwbinder - 2.3 - - ISoundTriggerHw - default - - android.hardware.graphics.allocator hwbinder @@ -139,22 +112,4 @@ default - - vendor.google.whitechapel.audio.audioext - hwbinder - 4.0 - - IAudioExt - default - - - - vendor.google.audiometricext - hwbinder - 1.0 - - IAudioMetricExt - default - - diff --git a/manifest.xml b/manifest.xml index 9cb47386..402cbba9 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,31 +1,4 @@ - - android.hardware.audio - hwbinder - 7.1 - - IDevicesFactory - default - - - - android.hardware.audio.effect - hwbinder - 7.0 - - IEffectsFactory - default - - - - android.hardware.soundtrigger - hwbinder - 2.3 - - ISoundTriggerHw - default - - android.hardware.graphics.mapper passthrough @@ -57,22 +30,4 @@ default - - vendor.google.whitechapel.audio.audioext - hwbinder - 4.0 - - IAudioExt - default - - - - vendor.google.audiometricext - hwbinder - 1.0 - - IAudioMetricExt - default - -