Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "audio: replace PRODUCT_COPY_FILES with PRODUCT_PACKAGES and prebuilt_etc" into main

Browse source
This commit is contained in:
David Li 2023-10-30 06:38:17 +00:00 • committed by Android (Google) Code Review
commit 2ba52304a1
4 changed files with 132 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

63
audio/husky/aidl_config/Android.bp Normal file
View file

@ -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"
],
}

7
audio/husky/audio-tables.mk
View file

@ -18,10 +18,9 @@ AUDIO_TABLE_FOLDER := husky
# Choose AIDL config by build flag. # Choose AIDL config by build flag.
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
PRODUCT_COPY_FILES += \ PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ PRODUCT_PACKAGES += audio_aidl_configs
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
else else
# Platform Configuration for AudioHAL / SoundTriggerHAL # Platform Configuration for AudioHAL / SoundTriggerHAL
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \

63
audio/shiba/aidl_config/Android.bp Normal file
View file

@ -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"
],
}

7
audio/shiba/audio-tables.mk
View file

@ -18,10 +18,9 @@ AUDIO_TABLE_FOLDER := shiba
# Choose AIDL config by build flag. # Choose AIDL config by build flag.
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
PRODUCT_COPY_FILES += \ PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ PRODUCT_PACKAGES += audio_aidl_configs
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
else else
# Platform Configuration for AudioHAL / SoundTriggerHAL # Platform Configuration for AudioHAL / SoundTriggerHAL
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \