diff options
author | Eric Laurent <elaurent@google.com> | 2014-05-22 17:30:48 -0700 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2014-05-22 19:56:15 -0700 |
commit | 7a0aecb09a562fec144c07aeb7a3468a1e6da52e (patch) | |
tree | 02937428f5af51143cf12c70268be83805843cc5 | |
parent | d6b1efbc99de43d56aa6a4123126e994e7c2c30e (diff) | |
download | frameworks_av-7a0aecb09a562fec144c07aeb7a3468a1e6da52e.zip frameworks_av-7a0aecb09a562fec144c07aeb7a3468a1e6da52e.tar.gz frameworks_av-7a0aecb09a562fec144c07aeb7a3468a1e6da52e.tar.bz2 |
audio policy: enable use of new AudioPolicyManager
Do not define USE_LEGACY_AUDIO_POLICY by default.
By default, all devices will now use the new audio policy implementation
in AudioPolicyManager.cpp
To continue using the legacy audio policy implemented by
AudioPolicyManagerBase in libhardware_legacy a device should
define USE_LEGACY_AUDIO_POLICY in its makefile.
Change-Id: I7b8cac3cbb24b11105ba6233501c7212f5985727
-rw-r--r-- | CleanSpec.mk | 2 | ||||
-rw-r--r-- | services/audiopolicy/Android.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index eba269b..20da925 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -53,6 +53,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicy $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libaudiopolicy.so) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicy_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libaudiopolicy.so) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicyservice_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicymanager_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/services/audiopolicy/Android.mk b/services/audiopolicy/Android.mk index b160fab..a22ad9d 100644 --- a/services/audiopolicy/Android.mk +++ b/services/audiopolicy/Android.mk @@ -5,9 +5,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ AudioPolicyService.cpp -# TODO: remove when enabling new audio policy -USE_LEGACY_AUDIO_POLICY = 1 - ifeq ($(USE_LEGACY_AUDIO_POLICY), 1) LOCAL_SRC_FILES += \ AudioPolicyInterfaceImplLegacy.cpp \ |