diff options
| author | Eric Laurent <elaurent@google.com> | 2014-05-22 00:40:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-22 00:40:14 +0000 |
| commit | d83062287758be57d1d0908b30bb18aa9b367f38 (patch) | |
| tree | 0efd8542cfb286a9d59c3c13ca455be14ba06f2f | |
| parent | 7ac0039611ea7ea18f9545f96a8f5cb31dcdebe5 (diff) | |
| parent | 98c6be0e30fa28e752b13f3dd5986d41710bb7ae (diff) | |
| download | frameworks_av-d83062287758be57d1d0908b30bb18aa9b367f38.zip frameworks_av-d83062287758be57d1d0908b30bb18aa9b367f38.tar.gz frameworks_av-d83062287758be57d1d0908b30bb18aa9b367f38.tar.bz2 | |
Merge "audio policy: split audio policy library"
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | media/mediaserver/Android.mk | 2 | ||||
| -rw-r--r-- | services/audiopolicy/Android.mk | 37 |
3 files changed, 36 insertions, 5 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index b8a9711..eba269b 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -51,6 +51,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudioflinge $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libaudioflinger.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/libaudiopolicy_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libaudiopolicy.so) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index 5bc3f2f..786bf0d 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -15,7 +15,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libaudioflinger \ - libaudiopolicy \ + libaudiopolicyservice \ libcamera_metadata\ libcameraservice \ libmedialogservice \ diff --git a/services/audiopolicy/Android.mk b/services/audiopolicy/Android.mk index f270bfc..b160fab 100644 --- a/services/audiopolicy/Android.mk +++ b/services/audiopolicy/Android.mk @@ -5,7 +5,9 @@ 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 \ @@ -15,8 +17,7 @@ LOCAL_SRC_FILES += \ else LOCAL_SRC_FILES += \ AudioPolicyInterfaceImpl.cpp \ - AudioPolicyClientImpl.cpp \ - AudioPolicyManager.cpp + AudioPolicyClientImpl.cpp endif LOCAL_C_INCLUDES := \ @@ -31,14 +32,42 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libmedia \ libhardware \ - libhardware_legacy + libhardware_legacy \ + +ifneq ($(USE_LEGACY_AUDIO_POLICY), 1) +LOCAL_SHARED_LIBRARIES += \ + libaudiopolicymanager +endif LOCAL_STATIC_LIBRARIES := \ libmedia_helper \ libserviceutility -LOCAL_MODULE:= libaudiopolicy +LOCAL_MODULE:= libaudiopolicyservice LOCAL_CFLAGS += -fvisibility=hidden include $(BUILD_SHARED_LIBRARY) + +ifneq ($(USE_LEGACY_AUDIO_POLICY), 1) +ifneq ($(USE_CUSTOM_AUDIO_POLICY), 1) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + AudioPolicyManager.cpp + +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + liblog + +LOCAL_STATIC_LIBRARIES := \ + libmedia_helper + +LOCAL_MODULE:= libaudiopolicymanager + +include $(BUILD_SHARED_LIBRARY) + +endif +endif |