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

Commit b15ed7a1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use libmedia_helper as shared lib."

parents 353613ca 08dab5ae

media/libaudiohal/Android.mk

+2 −3
Original line number Original line Diff line number Diff line
@@ -29,9 +29,8 @@ LOCAL_SHARED_LIBRARIES += \ 
    android.hardware.audio@2.0             \

    android.hardware.audio@2.0             \

    android.hardware.audio.common@2.0      \

    android.hardware.audio.common@2.0      \

    android.hardware.audio.common@2.0-util \

    android.hardware.audio.common@2.0-util \

    android.hardware.audio.effect@2.0

    android.hardware.audio.effect@2.0 \



    libmedia_helper

LOCAL_WHOLE_STATIC_LIBRARIES := libmedia_helper





else  # if !ENABLE_TREBLE

else  # if !ENABLE_TREBLE

media/libmedia/Android.bp

+4 −1
Original line number Original line Diff line number Diff line 
cc_library_static {

cc_library {

    name: "libmedia_helper",

    name: "libmedia_helper",

    srcs: ["AudioParameter.cpp", "TypeConverter.cpp"],

    srcs: ["AudioParameter.cpp", "TypeConverter.cpp"],

    cflags: [

    cflags: [
@@ -6,5 +6,8 @@ cc_library_static { 
        "-Wno-error=deprecated-declarations",

        "-Wno-error=deprecated-declarations",

        "-Wall",

        "-Wall",

    ],

    ],

    shared: {

      shared_libs: ["libutils", "liblog"],

    },

    clang: true,

    clang: true,

}
 
}

media/libmedia/Android.mk

+2 −3
Original line number Original line Diff line number Diff line
@@ -59,12 +59,11 @@ LOCAL_SRC_FILES += \ 
LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

	libui liblog libcutils libutils libbinder libsonivox libicuuc libicui18n libexpat \

	libui liblog libcutils libutils libbinder libsonivox libicuuc libicui18n libexpat \

        libcamera_client libstagefright_foundation \

        libcamera_client libstagefright_foundation \

        libgui libdl libaudioutils libaudioclient

        libgui libdl libaudioutils libaudioclient \

        libmedia_helper





LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbinder libsonivox

LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbinder libsonivox





LOCAL_WHOLE_STATIC_LIBRARIES := libmedia_helper



# for memory heap analysis

# for memory heap analysis

LOCAL_STATIC_LIBRARIES := libc_malloc_debug_backtrace libc_logging

LOCAL_STATIC_LIBRARIES := libc_malloc_debug_backtrace libc_logging

media/libstagefright/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -108,9 +108,9 @@ LOCAL_STATIC_LIBRARIES := \ 
        libstagefright_mpeg2ts \

        libstagefright_mpeg2ts \

        libstagefright_id3 \

        libstagefright_id3 \

        libFLAC \

        libFLAC \

        libmedia_helper \





LOCAL_SHARED_LIBRARIES += \

LOCAL_SHARED_LIBRARIES += \

        libmedia_helper \

        libstagefright_foundation \

        libstagefright_foundation \

        libdl \

        libdl \

        libRScpp \

        libRScpp \

services/audioflinger/Android.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -57,11 +57,11 @@ LOCAL_SHARED_LIBRARIES := \ 
    libserviceutility \

    libserviceutility \

    libsonic \

    libsonic \

    libmediautils \

    libmediautils \

    libmemunreachable

    libmemunreachable \

    libmedia_helper





LOCAL_STATIC_LIBRARIES := \

LOCAL_STATIC_LIBRARIES := \

    libcpustats \

    libcpustats \

    libmedia_helper





LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)

LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)