diff options
| author | Eric Laurent <elaurent@google.com> | 2014-05-23 23:01:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-23 23:01:16 +0000 |
| commit | 7a470c375c2cef8b186fbadd9915b30e5d757453 (patch) | |
| tree | bb985c4b1285ed583e1866ec04a980238c1108db | |
| parent | 39cf5681975ec9097742c47de7c2d0f8c11248a2 (diff) | |
| parent | 7a0aecb09a562fec144c07aeb7a3468a1e6da52e (diff) | |
| download | frameworks_av-7a470c375c2cef8b186fbadd9915b30e5d757453.zip frameworks_av-7a470c375c2cef8b186fbadd9915b30e5d757453.tar.gz frameworks_av-7a470c375c2cef8b186fbadd9915b30e5d757453.tar.bz2 | |
Merge "audio policy: enable use of new AudioPolicyManager"
| -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 \ |