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

Commit cb680c9c authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "Convert Android.mk in libaudioclient to Android.bp" am: 0da9804f am: 05dfbecf

am: 19031e67

Change-Id: I528e03e58d8a34316cf8270d3bb2b5b5d828eee1
parents 90335122 19031e67
Loading
Loading
Loading
Loading
+45 −0
Original line number Diff line number Diff line
cc_library_shared {
    name: "libaudioclient",
    srcs: [
        "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",
    ],
    shared_libs: [
        "liblog",
        "libcutils",
        "libutils",
        "libbinder",
        "libdl",
        "libaudioutils",
    ],
    export_shared_lib_headers: ["libbinder"],
    // for memory heap analysis
    static_libs: [
        "libc_malloc_debug_backtrace",
        "libc_logging",
    ],
    cflags: [
        "-Werror",
        "-Wno-error=deprecated-declarations",
        "-Wall",
    ],
    sanitize: {
        misc_undefined : [
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
    },
}

media/libaudioclient/Android.mk

deleted100644 → 0
+0 −50
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)