b4150586c5
audio_policy_configuration_generic.xml is pushed in /system as the default
configuration (used if the vendor does not provide one in /vendor or /odm)
and for the emulator.
As a result it can be parsed by 2.0 and 4.0 audio HALs. The format
is retro-compatible, but not forward-compatible.
Additionally, the generic config pushed in /system should never be used
as the vendor should always provide a configuration file describing its
target architecture. Thus it should not be part of the GSI.
Those files were originally pushed in /system the emulator
target does not provide its own configuration file.
The emulator should provide config file instead in /vendor instead.
Bug: 78543061
Test: sdk_gphone_x86 and aosp_x86_64 emulator has audio
Test: adb shell cat /vendor/etc/audio_policy_configuration.xml | diff - \
frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml
Change-Id: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Merged-In: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit dad3ad6126
)
28 lines
1.2 KiB
Makefile
28 lines
1.2 KiB
Makefile
#
|
|
# Copyright (C) 2013 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.
|
|
#
|
|
|
|
# NFC:
|
|
# Provide default libnfc-nci.conf file for devices that does not have one in
|
|
# vendor/etc because aosp system image (of aosp_$arch products) is going to
|
|
# be used as GSI.
|
|
# May need to remove the following for newly launched devices in P since this
|
|
# NFC configuration file should be in vendor/etc, instead of system/etc
|
|
PRODUCT_COPY_FILES += \
|
|
device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf
|
|
|
|
# Adjust the Dalvik heap to be appropriate for a tablet.
|
|
$(call inherit-product-if-exists, frameworks/base/build/tablet-dalvik-heap.mk)
|
|
$(call inherit-product-if-exists, frameworks/native/build/tablet-dalvik-heap.mk)
|