diff options
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | media/mediaserver/Android.mk | 2 | ||||
| -rw-r--r-- | services/audioflinger/Android.mk | 16 | ||||
| -rw-r--r-- | services/audiopolicy/Android.mk | 30 | ||||
| -rw-r--r-- | services/audiopolicy/AudioPolicyService.cpp (renamed from services/audioflinger/AudioPolicyService.cpp) | 0 | ||||
| -rw-r--r-- | services/audiopolicy/AudioPolicyService.h (renamed from services/audioflinger/AudioPolicyService.h) | 0 |
6 files changed, 47 insertions, 3 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index e6d9ebf..94aac5c 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -47,6 +47,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libmedia_nativ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/libmedia_native.so) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/libmedia_native.so) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libmedia_native.so) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudioflinger_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libaudioflinger.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 f848054..9335a84 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -15,6 +15,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libaudioflinger \ + libaudiopolicy \ libcamera_metadata\ libcameraservice \ libmedialogservice \ @@ -33,6 +34,7 @@ LOCAL_C_INCLUDES := \ frameworks/av/media/libmediaplayerservice \ frameworks/av/services/medialog \ frameworks/av/services/audioflinger \ + frameworks/av/services/audiopolicy \ frameworks/av/services/camera/libcameraservice LOCAL_MODULE:= mediaserver diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 4524d3c..f1ab072 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -13,6 +13,16 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) +LOCAL_SRC_FILES := \ + ServiceUtilities.cpp + +# FIXME Move this library to frameworks/native +LOCAL_MODULE := libserviceutility + +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + LOCAL_SRC_FILES:= \ AudioFlinger.cpp \ Threads.cpp \ @@ -20,8 +30,6 @@ LOCAL_SRC_FILES:= \ Effects.cpp \ AudioMixer.cpp.arm \ AudioResampler.cpp.arm \ - AudioPolicyService.cpp \ - ServiceUtilities.cpp \ AudioResamplerCubic.cpp.arm \ AudioResamplerSinc.cpp.arm \ AudioResamplerDyn.cpp.arm @@ -29,6 +37,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES += StateQueue.cpp LOCAL_C_INCLUDES := \ + $(TOPDIR)frameworks/av/services/audiopolicy \ $(call include-path-for, audio-effects) \ $(call include-path-for, audio-utils) @@ -50,7 +59,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libscheduling_policy \ libcpustats \ - libmedia_helper + libmedia_helper \ + libserviceutility LOCAL_MODULE:= libaudioflinger diff --git a/services/audiopolicy/Android.mk b/services/audiopolicy/Android.mk new file mode 100644 index 0000000..7d9e014 --- /dev/null +++ b/services/audiopolicy/Android.mk @@ -0,0 +1,30 @@ +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + AudioPolicyService.cpp + +LOCAL_C_INCLUDES := \ + $(TOPDIR)frameworks/av/services/audioflinger \ + $(call include-path-for, audio-effects) \ + $(call include-path-for, audio-utils) + +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + liblog \ + libbinder \ + libmedia \ + libhardware \ + libhardware_legacy + +LOCAL_STATIC_LIBRARIES := \ + libmedia_helper \ + libserviceutility + +LOCAL_MODULE:= libaudiopolicy + +LOCAL_CFLAGS += -fvisibility=hidden + +include $(BUILD_SHARED_LIBRARY) diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audiopolicy/AudioPolicyService.cpp index 41bd990..41bd990 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audiopolicy/AudioPolicyService.cpp diff --git a/services/audioflinger/AudioPolicyService.h b/services/audiopolicy/AudioPolicyService.h index ae053a9..ae053a9 100644 --- a/services/audioflinger/AudioPolicyService.h +++ b/services/audiopolicy/AudioPolicyService.h |