forked from openkylin/platform_build
Merge "Add emulator audio policy config in /vendor not /system"
This commit is contained in:
commit
d8f86ae1fe
|
@ -14,14 +14,6 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
# minimal configuration for audio policy.
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:system/etc/primary_audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \
|
||||
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \
|
||||
|
||||
# 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
|
||||
|
|
|
@ -14,14 +14,6 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
# minimal configuration for audio policy.
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:system/etc/primary_audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \
|
||||
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \
|
||||
|
||||
# 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
|
||||
|
|
|
@ -14,14 +14,6 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
# minimal configuration for audio policy.
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:system/etc/primary_audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \
|
||||
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \
|
||||
|
||||
# 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
|
||||
|
|
|
@ -14,14 +14,6 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
# minimal configuration for audio policy.
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:system/etc/primary_audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \
|
||||
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \
|
||||
|
||||
# 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
|
||||
|
|
|
@ -31,15 +31,6 @@ PRODUCT_FULL_TREBLE_OVERRIDE := true
|
|||
PRODUCT_PACKAGES += \
|
||||
messaging
|
||||
|
||||
# The following policy XML files are used as fallback for
|
||||
# vendors/devices not using XML to configure audio policy.
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:system/etc/primary_audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \
|
||||
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \
|
||||
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \
|
||||
|
||||
# Telephony:
|
||||
# Provide a default APN configuration
|
||||
PRODUCT_COPY_FILES += \
|
||||
|
|
Loading…
Reference in New Issue