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

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

Merge "audio policy: split audio policy library"

parents 7ac00396 98c6be0e

CleanSpec.mk

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

media/mediaserver/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

	libaudioflinger \

	libaudiopolicy \

	libaudiopolicyservice \

	libcamera_metadata\

	libcameraservice \

	libmedialogservice \

services/audiopolicy/Android.mk

+33 −4
Original line number Diff line number Diff line
@@ -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