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

Commit 2805f438 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Split libmedia into libmedia and libaudioclient"

parents 267e07cd 538ec5e0

cmds/stagefright/Android.mk

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


LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libstagefright_foundation \

	libmedia libgui libcutils libui

	libmedia libgui libcutils



LOCAL_C_INCLUDES:= \

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


LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libstagefright_foundation \

	libmedia libgui libcutils libui

	libmedia libaudioclient libgui libcutils



LOCAL_C_INCLUDES:= \

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

	libgui \

	libcutils \

	libui \

	libRScpp \



LOCAL_C_INCLUDES:= \
@@ -218,7 +217,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libstagefright_foundation \

	libmedia libgui libcutils libui libc

	libcutils libc



LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

media/libaudioclient/Android.mk

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