From f064762ef664252c6e7bd2660361d212680048ad Mon Sep 17 00:00:00 2001 From: Simon1511 Date: Mon, 13 Feb 2023 21:29:28 +0100 Subject: [PATCH] sm7125-common: Move audio configs to audio folder Change-Id: I243efd030f5079ce457c19607b600679bdbf1655 --- .../audio => audio/configs}/audio_configs.xml | 0 .../configs}/audio_configs_stock.xml | 0 .../configs}/audio_effects.conf | 0 .../audio => audio/configs}/audio_effects.xml | 0 .../configs}/audio_io_policy.conf | 0 .../configs}/audio_platform_info.xml | 0 .../configs}/audio_platform_info_diff.xml | 0 .../configs}/audio_platform_info_intcodec.xml | 0 .../configs}/audio_policy_configuration.xml | 0 .../configs}/mixer_usb_default.xml | 0 .../configs}/mixer_usb_gray.xml | 0 .../configs}/sound_trigger_mixer_paths.xml | 0 .../configs}/sound_trigger_platform_info.xml | 0 audio/{ => impl}/Android.bp | 0 audio/{ => impl}/Device.cpp | 0 audio/{ => impl}/DevicesFactory.cpp | 0 audio/{ => impl}/ParametersUtil.cpp | 0 audio/{ => impl}/PrimaryDevice.cpp | 0 audio/{ => impl}/Stream.cpp | 0 audio/{ => impl}/StreamIn.cpp | 0 audio/{ => impl}/StreamOut.cpp | 0 .../{ => impl}/include/core/default/Device.h | 0 .../include/core/default/DevicesFactory.h | 0 .../include/core/default/ParametersUtil.h | 0 .../include/core/default/PrimaryDevice.h | 0 .../{ => impl}/include/core/default/Stream.h | 0 .../include/core/default/StreamIn.h | 0 .../include/core/default/StreamOut.h | 0 audio/{ => impl}/include/core/default/Util.h | 0 common.mk | 26 +++++++++---------- 30 files changed, 13 insertions(+), 13 deletions(-) rename {configs/audio => audio/configs}/audio_configs.xml (100%) rename {configs/audio => audio/configs}/audio_configs_stock.xml (100%) rename {configs/audio => audio/configs}/audio_effects.conf (100%) rename {configs/audio => audio/configs}/audio_effects.xml (100%) rename {configs/audio => audio/configs}/audio_io_policy.conf (100%) rename {configs/audio => audio/configs}/audio_platform_info.xml (100%) rename {configs/audio => audio/configs}/audio_platform_info_diff.xml (100%) rename {configs/audio => audio/configs}/audio_platform_info_intcodec.xml (100%) rename {configs/audio => audio/configs}/audio_policy_configuration.xml (100%) rename {configs/audio => audio/configs}/mixer_usb_default.xml (100%) rename {configs/audio => audio/configs}/mixer_usb_gray.xml (100%) rename {configs/audio => audio/configs}/sound_trigger_mixer_paths.xml (100%) rename {configs/audio => audio/configs}/sound_trigger_platform_info.xml (100%) rename audio/{ => impl}/Android.bp (100%) rename audio/{ => impl}/Device.cpp (100%) rename audio/{ => impl}/DevicesFactory.cpp (100%) rename audio/{ => impl}/ParametersUtil.cpp (100%) rename audio/{ => impl}/PrimaryDevice.cpp (100%) rename audio/{ => impl}/Stream.cpp (100%) rename audio/{ => impl}/StreamIn.cpp (100%) rename audio/{ => impl}/StreamOut.cpp (100%) rename audio/{ => impl}/include/core/default/Device.h (100%) rename audio/{ => impl}/include/core/default/DevicesFactory.h (100%) rename audio/{ => impl}/include/core/default/ParametersUtil.h (100%) rename audio/{ => impl}/include/core/default/PrimaryDevice.h (100%) rename audio/{ => impl}/include/core/default/Stream.h (100%) rename audio/{ => impl}/include/core/default/StreamIn.h (100%) rename audio/{ => impl}/include/core/default/StreamOut.h (100%) rename audio/{ => impl}/include/core/default/Util.h (100%) diff --git a/configs/audio/audio_configs.xml b/audio/configs/audio_configs.xml similarity index 100% rename from configs/audio/audio_configs.xml rename to audio/configs/audio_configs.xml diff --git a/configs/audio/audio_configs_stock.xml b/audio/configs/audio_configs_stock.xml similarity index 100% rename from configs/audio/audio_configs_stock.xml rename to audio/configs/audio_configs_stock.xml diff --git a/configs/audio/audio_effects.conf b/audio/configs/audio_effects.conf similarity index 100% rename from configs/audio/audio_effects.conf rename to audio/configs/audio_effects.conf diff --git a/configs/audio/audio_effects.xml b/audio/configs/audio_effects.xml similarity index 100% rename from configs/audio/audio_effects.xml rename to audio/configs/audio_effects.xml diff --git a/configs/audio/audio_io_policy.conf b/audio/configs/audio_io_policy.conf similarity index 100% rename from configs/audio/audio_io_policy.conf rename to audio/configs/audio_io_policy.conf diff --git a/configs/audio/audio_platform_info.xml b/audio/configs/audio_platform_info.xml similarity index 100% rename from configs/audio/audio_platform_info.xml rename to audio/configs/audio_platform_info.xml diff --git a/configs/audio/audio_platform_info_diff.xml b/audio/configs/audio_platform_info_diff.xml similarity index 100% rename from configs/audio/audio_platform_info_diff.xml rename to audio/configs/audio_platform_info_diff.xml diff --git a/configs/audio/audio_platform_info_intcodec.xml b/audio/configs/audio_platform_info_intcodec.xml similarity index 100% rename from configs/audio/audio_platform_info_intcodec.xml rename to audio/configs/audio_platform_info_intcodec.xml diff --git a/configs/audio/audio_policy_configuration.xml b/audio/configs/audio_policy_configuration.xml similarity index 100% rename from configs/audio/audio_policy_configuration.xml rename to audio/configs/audio_policy_configuration.xml diff --git a/configs/audio/mixer_usb_default.xml b/audio/configs/mixer_usb_default.xml similarity index 100% rename from configs/audio/mixer_usb_default.xml rename to audio/configs/mixer_usb_default.xml diff --git a/configs/audio/mixer_usb_gray.xml b/audio/configs/mixer_usb_gray.xml similarity index 100% rename from configs/audio/mixer_usb_gray.xml rename to audio/configs/mixer_usb_gray.xml diff --git a/configs/audio/sound_trigger_mixer_paths.xml b/audio/configs/sound_trigger_mixer_paths.xml similarity index 100% rename from configs/audio/sound_trigger_mixer_paths.xml rename to audio/configs/sound_trigger_mixer_paths.xml diff --git a/configs/audio/sound_trigger_platform_info.xml b/audio/configs/sound_trigger_platform_info.xml similarity index 100% rename from configs/audio/sound_trigger_platform_info.xml rename to audio/configs/sound_trigger_platform_info.xml diff --git a/audio/Android.bp b/audio/impl/Android.bp similarity index 100% rename from audio/Android.bp rename to audio/impl/Android.bp diff --git a/audio/Device.cpp b/audio/impl/Device.cpp similarity index 100% rename from audio/Device.cpp rename to audio/impl/Device.cpp diff --git a/audio/DevicesFactory.cpp b/audio/impl/DevicesFactory.cpp similarity index 100% rename from audio/DevicesFactory.cpp rename to audio/impl/DevicesFactory.cpp diff --git a/audio/ParametersUtil.cpp b/audio/impl/ParametersUtil.cpp similarity index 100% rename from audio/ParametersUtil.cpp rename to audio/impl/ParametersUtil.cpp diff --git a/audio/PrimaryDevice.cpp b/audio/impl/PrimaryDevice.cpp similarity index 100% rename from audio/PrimaryDevice.cpp rename to audio/impl/PrimaryDevice.cpp diff --git a/audio/Stream.cpp b/audio/impl/Stream.cpp similarity index 100% rename from audio/Stream.cpp rename to audio/impl/Stream.cpp diff --git a/audio/StreamIn.cpp b/audio/impl/StreamIn.cpp similarity index 100% rename from audio/StreamIn.cpp rename to audio/impl/StreamIn.cpp diff --git a/audio/StreamOut.cpp b/audio/impl/StreamOut.cpp similarity index 100% rename from audio/StreamOut.cpp rename to audio/impl/StreamOut.cpp diff --git a/audio/include/core/default/Device.h b/audio/impl/include/core/default/Device.h similarity index 100% rename from audio/include/core/default/Device.h rename to audio/impl/include/core/default/Device.h diff --git a/audio/include/core/default/DevicesFactory.h b/audio/impl/include/core/default/DevicesFactory.h similarity index 100% rename from audio/include/core/default/DevicesFactory.h rename to audio/impl/include/core/default/DevicesFactory.h diff --git a/audio/include/core/default/ParametersUtil.h b/audio/impl/include/core/default/ParametersUtil.h similarity index 100% rename from audio/include/core/default/ParametersUtil.h rename to audio/impl/include/core/default/ParametersUtil.h diff --git a/audio/include/core/default/PrimaryDevice.h b/audio/impl/include/core/default/PrimaryDevice.h similarity index 100% rename from audio/include/core/default/PrimaryDevice.h rename to audio/impl/include/core/default/PrimaryDevice.h diff --git a/audio/include/core/default/Stream.h b/audio/impl/include/core/default/Stream.h similarity index 100% rename from audio/include/core/default/Stream.h rename to audio/impl/include/core/default/Stream.h diff --git a/audio/include/core/default/StreamIn.h b/audio/impl/include/core/default/StreamIn.h similarity index 100% rename from audio/include/core/default/StreamIn.h rename to audio/impl/include/core/default/StreamIn.h diff --git a/audio/include/core/default/StreamOut.h b/audio/impl/include/core/default/StreamOut.h similarity index 100% rename from audio/include/core/default/StreamOut.h rename to audio/impl/include/core/default/StreamOut.h diff --git a/audio/include/core/default/Util.h b/audio/impl/include/core/default/Util.h similarity index 100% rename from audio/include/core/default/Util.h rename to audio/impl/include/core/default/Util.h diff --git a/common.mk b/common.mk index 5cb3df8..da60523 100644 --- a/common.mk +++ b/common.mk @@ -84,19 +84,19 @@ PRODUCT_PACKAGES += \ TARGET_EXCLUDES_AUDIOFX := true PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/audio/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs.xml \ - $(COMMON_PATH)/configs/audio/audio_configs_stock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs_stock.xml \ - $(COMMON_PATH)/configs/audio/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \ - $(COMMON_PATH)/configs/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ - $(COMMON_PATH)/configs/audio/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf\ - $(COMMON_PATH)/configs/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ - $(COMMON_PATH)/configs/audio/audio_platform_info_diff.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_diff.xml \ - $(COMMON_PATH)/configs/audio/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \ - $(COMMON_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - $(COMMON_PATH)/configs/audio/mixer_usb_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_usb_default.xml \ - $(COMMON_PATH)/configs/audio/mixer_usb_gray.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_usb_gray.xml \ - $(COMMON_PATH)/configs/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ - $(COMMON_PATH)/configs/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ + $(COMMON_PATH)/audio/configs/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs.xml \ + $(COMMON_PATH)/audio/configs/audio_configs_stock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs_stock.xml \ + $(COMMON_PATH)/audio/configs/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \ + $(COMMON_PATH)/audio/configs/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ + $(COMMON_PATH)/audio/configs/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf\ + $(COMMON_PATH)/audio/configs/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ + $(COMMON_PATH)/audio/configs/audio_platform_info_diff.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_diff.xml \ + $(COMMON_PATH)/audio/configs/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \ + $(COMMON_PATH)/audio/configs/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + $(COMMON_PATH)/audio/configs/mixer_usb_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_usb_default.xml \ + $(COMMON_PATH)/audio/configs/mixer_usb_gray.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_usb_gray.xml \ + $(COMMON_PATH)/audio/configs/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ + $(COMMON_PATH)/audio/configs/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \