Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31486911 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "move audio policy service to a separate library"

parents 37e05edf c7e5040a

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

# ************************************************

media/mediaserver/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

services/audioflinger/Android.mk

+13 −3
Original line number Diff line number Diff line
@@ -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

LOCAL_32_BIT_ONLY := true

services/audiopolicy/Android.mk

0 → 100644
+30 −0
Original line number Diff line number Diff line 
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)