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

Commit 5e600f41 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Split ManagerDefault into Manager and ManagerDefinitions"

parents 07a4422d 98cc1912

media/mediaserver/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ LOCAL_C_INCLUDES := \ 
    frameworks/av/services/medialog \

    frameworks/av/services/audioflinger \

    frameworks/av/services/audiopolicy \

    frameworks/av/services/audiopolicy/common/managerdefinitions/include \

    frameworks/av/services/camera/libcameraservice \

    frameworks/av/services/mediaresourcemanager \

    $(call include-path-for, audio-utils) \

services/audiopolicy/Android.mk

+13 −10
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ else 
LOCAL_SRC_FILES += \

    service/AudioPolicyInterfaceImpl.cpp \

    service/AudioPolicyClientImpl.cpp



endif



LOCAL_C_INCLUDES := \
@@ -39,7 +40,8 @@ LOCAL_SHARED_LIBRARIES += \ 
endif



LOCAL_STATIC_LIBRARIES := \

    libmedia_helper

    libmedia_helper \

    libaudiopolicycomponents



LOCAL_MODULE:= libaudiopolicyservice
@@ -54,14 +56,6 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES:= \

    managerdefault/AudioPolicyManager.cpp \

    managerdefault/ConfigParsingUtils.cpp \

    managerdefault/Devices.cpp \

    managerdefault/Gains.cpp \

    managerdefault/HwModule.cpp \

    managerdefault/IOProfile.cpp \

    managerdefault/Ports.cpp \

    managerdefault/AudioInputDescriptor.cpp \

    managerdefault/AudioOutputDescriptor.cpp



LOCAL_SHARED_LIBRARIES := \

    libcutils \
@@ -70,7 +64,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libsoundtrigger



LOCAL_STATIC_LIBRARIES := \

    libmedia_helper

    libmedia_helper \

    libaudiopolicycomponents



LOCAL_MODULE:= libaudiopolicymanagerdefault
@@ -86,9 +81,17 @@ LOCAL_SRC_FILES:= \ 
LOCAL_SHARED_LIBRARIES := \

    libaudiopolicymanagerdefault



LOCAL_STATIC_LIBRARIES := \

    libaudiopolicycomponents



LOCAL_MODULE:= libaudiopolicymanager



include $(BUILD_SHARED_LIBRARY)



endif

endif



#######################################################################

# Recursive call sub-folder Android.mk

#

include $(call all-makefiles-under,$(LOCAL_PATH))

services/audiopolicy/common/Android.mk

0 → 100644
+9 −0
Original line number Diff line number Diff line 


LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



#######################################################################

# Recursive call sub-folder Android.mk

#

include $(call all-makefiles-under,$(LOCAL_PATH))

services/audiopolicy/common/managerdefinitions/Android.mk

0 → 100644
+29 −0
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

    src/DeviceDescriptor.cpp \

    src/AudioGain.cpp \

    src/HwModule.cpp \

    src/IOProfile.cpp \

    src/AudioPort.cpp \

    src/AudioPatch.cpp \

    src/AudioInputDescriptor.cpp \

    src/AudioOutputDescriptor.cpp \

    src/ConfigParsingUtils.cpp \



LOCAL_SHARED_LIBRARIES := \

    libcutils \

    libutils \

    liblog \



LOCAL_C_INCLUDES += \

    $(LOCAL_PATH)/include \



LOCAL_EXPORT_C_INCLUDE_DIRS := \

    $(LOCAL_PATH)/include



LOCAL_MODULE := libaudiopolicycomponents



include $(BUILD_STATIC_LIBRARY)