From c514210662941cafee6f17cc7911dec3f319d537 Mon Sep 17 00:00:00 2001 From: David Li Date: Tue, 24 Oct 2023 15:44:19 +0800 Subject: [PATCH] audio: replace PRODUCT_COPY_FILES with PRODUCT_PACKAGES and prebuilt_etc Bug: 307473885 Test: mm Change-Id: I62c8fc2c6ff991fe52a5ade08694f09f8e830eae --- audio/husky/aidl_config/Android.bp | 63 ++++++++++++++++++++++++++++++ audio/husky/audio-tables.mk | 7 ++-- audio/shiba/aidl_config/Android.bp | 63 ++++++++++++++++++++++++++++++ audio/shiba/audio-tables.mk | 7 ++-- 4 files changed, 132 insertions(+), 8 deletions(-) create mode 100644 audio/husky/aidl_config/Android.bp create mode 100644 audio/shiba/aidl_config/Android.bp diff --git a/audio/husky/aidl_config/Android.bp b/audio/husky/aidl_config/Android.bp new file mode 100644 index 0000000..223b678 --- /dev/null +++ b/audio/husky/aidl_config/Android.bp @@ -0,0 +1,63 @@ +// Copyright (C) 2023 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +soong_namespace { + imports: [ + "frameworks/av/services/audiopolicy/config", + ] +} + +package { + default_applicable_licenses: [ + "Android-Apache-2.0", + ], +} + +prebuilt_etc { + name: "audio_policy_volumes.xml", + src: "audio_policy_volumes.xml", + soc_specific: true, +} + +prebuilt_etc { + name: "imported_default_volume_tables.xml", + src: "//frameworks/av/services/audiopolicy/config:default_volume_tables.xml", + soc_specific: true, + filename_from_src: true, +} + +prebuilt_etc { + name: "audio_platform_configuration.xml", + src: "audio_platform_configuration.xml", + soc_specific: true, + required: [ + "audio_policy_volumes.xml", + "imported_default_volume_tables.xml", + ], +} + +prebuilt_etc { + name: "mixer_paths_aidl.xml", + src: "mixer_paths_aidl.xml", + soc_specific: true, +} + +phony { + name: "audio_aidl_configs", + soc_specific: true, + required: [ + "audio_platform_configuration.xml", + "mixer_paths_aidl.xml" + ], +} diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index b4e3ce2..e1b429a 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -18,10 +18,9 @@ AUDIO_TABLE_FOLDER := husky # Choose AIDL config by build flag. ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) -PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml +PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config +PRODUCT_PACKAGES += audio_aidl_configs + else # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ diff --git a/audio/shiba/aidl_config/Android.bp b/audio/shiba/aidl_config/Android.bp new file mode 100644 index 0000000..223b678 --- /dev/null +++ b/audio/shiba/aidl_config/Android.bp @@ -0,0 +1,63 @@ +// Copyright (C) 2023 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +soong_namespace { + imports: [ + "frameworks/av/services/audiopolicy/config", + ] +} + +package { + default_applicable_licenses: [ + "Android-Apache-2.0", + ], +} + +prebuilt_etc { + name: "audio_policy_volumes.xml", + src: "audio_policy_volumes.xml", + soc_specific: true, +} + +prebuilt_etc { + name: "imported_default_volume_tables.xml", + src: "//frameworks/av/services/audiopolicy/config:default_volume_tables.xml", + soc_specific: true, + filename_from_src: true, +} + +prebuilt_etc { + name: "audio_platform_configuration.xml", + src: "audio_platform_configuration.xml", + soc_specific: true, + required: [ + "audio_policy_volumes.xml", + "imported_default_volume_tables.xml", + ], +} + +prebuilt_etc { + name: "mixer_paths_aidl.xml", + src: "mixer_paths_aidl.xml", + soc_specific: true, +} + +phony { + name: "audio_aidl_configs", + soc_specific: true, + required: [ + "audio_platform_configuration.xml", + "mixer_paths_aidl.xml" + ], +} diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index 1846772..b5e8045 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -18,10 +18,9 @@ AUDIO_TABLE_FOLDER := shiba # Choose AIDL config by build flag. ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) -PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml +PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config +PRODUCT_PACKAGES += audio_aidl_configs + else # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \