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

Commit ce5749ea authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Split libmedia into libmedia and libaudioclient am: 795a2a75 am: 4ea92981 

am: e5a73e6a

Change-Id: Ib48ce56d342bfe745345d7c899613d3f950b9a67
parents 03b3d23b e5a73e6a

cmds/stagefright/Android.mk

+3 −4
Original line number Original line Diff line number Diff line
@@ -134,7 +134,7 @@ LOCAL_SRC_FILES:= \ 




LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libstagefright_foundation \

	libstagefright liblog libutils libbinder libstagefright_foundation \

	libmedia libgui libcutils libui

	libmedia libgui libcutils





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

	frameworks/av/media/libstagefright \
@@ -159,7 +159,7 @@ LOCAL_SRC_FILES:= \ 




LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libstagefright_foundation \

	libstagefright liblog libutils libbinder libstagefright_foundation \

	libmedia libgui libcutils libui

	libmedia libaudioclient libgui libcutils





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

	frameworks/av/media/libstagefright \
@@ -193,7 +193,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libmedia \

	libmedia \

	libgui \

	libgui \

	libcutils \

	libcutils \

	libui \

	libRScpp \

	libRScpp \





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \
@@ -226,7 +225,7 @@ LOCAL_SRC_FILES:= \ 




LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libstagefright_foundation \

	libstagefright liblog libutils libbinder libstagefright_foundation \

	libmedia libgui libcutils libui libc

	libcutils libc





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

	frameworks/av/media/libstagefright \

media/libaudioclient/Android.mk

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



include $(CLEAR_VARS)



LOCAL_SRC_FILES += \

    AudioEffect.cpp \

    AudioPolicy.cpp \

    AudioRecord.cpp \

    AudioSystem.cpp \

    AudioTrack.cpp \

    AudioTrackShared.cpp \

    IAudioFlinger.cpp \

    IAudioFlingerClient.cpp \

    IAudioPolicyService.cpp \

    IAudioPolicyServiceClient.cpp \

    IAudioRecord.cpp \

    IAudioTrack.cpp \

    IEffect.cpp \

    IEffectClient.cpp \

    ToneGenerator.cpp \



LOCAL_SHARED_LIBRARIES := \

	liblog libcutils libutils libbinder \

        libdl libaudioutils \



LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbinder



# for memory heap analysis

LOCAL_STATIC_LIBRARIES := libc_malloc_debug_backtrace libc_logging



LOCAL_MODULE:= libaudioclient



LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_C_INCLUDES := \

    $(TOP)/frameworks/native/include/media/openmax \

    $(TOP)/frameworks/av/include/media/ \

    $(TOP)/frameworks/av/media/libstagefright \

    $(TOP)/frameworks/av/media/libmedia/aidl \

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



LOCAL_EXPORT_C_INCLUDE_DIRS := \

    frameworks/av/include/media \

    frameworks/av/media/libmedia/aidl



LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall

LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow



include $(BUILD_SHARED_LIBRARY)