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

Commit 08dab5ae authored by Jaekyun Seok's avatar Jaekyun Seok
Browse files

Use libmedia_helper as shared lib. 

The dependencies to static libraries in frameworks should be removed
as many as possible to reduce a size of the system partition.
And that will improve coverage of the VNDK libraries because this
effort might find new necessary shared libs which were linked
statically before.

Size diffs of affected binaries on angler-userdebug build are as
follows.

libmedia                    : 598056 -> 547928 (-50128)
libstagefright              : 1496420 -> 1492124 (-4296)
libaudiopolicyservice       : 75372 -> 66940 (-8432)
libaudiopolicymanagerdefault: 613168 -> 583516 (-29652)
libaudioflinger             : 397840 -> 364380 (-33460)
libaudiohal                 : 114752 -> 68684 (-46068)
libaudiopolicyenginedefault : 122096 -> 71968 (-50128)
libmedia_helper             : 0 -> 66288 (+66288)

total                       : (-155876)

Test: building succeeded, and the image was tested on angler.
Bug: 33056637
Change-Id: I00a71e518337a1efcf7f55256145776311596991
parent 8526d86a

media/libaudiohal/Android.mk

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

    android.hardware.audio.common@2.0      \

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

    android.hardware.audio.effect@2.0



LOCAL_WHOLE_STATIC_LIBRARIES := libmedia_helper

    android.hardware.audio.effect@2.0 \

    libmedia_helper



else  # if !ENABLE_TREBLE

media/libmedia/Android.bp

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

cc_library {

    name: "libmedia_helper",

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

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

        "-Wall",

    ],

    shared: {

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

    },

    clang: true,

}

media/libmedia/Android.mk

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

	libui liblog libcutils libutils libbinder libsonivox libicuuc libicui18n libexpat \

        libcamera_client libstagefright_foundation \

        libgui libdl libaudioutils libaudioclient

        libgui libdl libaudioutils libaudioclient \

        libmedia_helper



LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbinder libsonivox



LOCAL_WHOLE_STATIC_LIBRARIES := libmedia_helper



# for memory heap analysis

LOCAL_STATIC_LIBRARIES := libc_malloc_debug_backtrace libc_logging

media/libstagefright/Android.mk

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

        libstagefright_id3 \

        libFLAC \

        libmedia_helper \



LOCAL_SHARED_LIBRARIES += \

        libmedia_helper \

        libstagefright_foundation \

        libdl \

        libRScpp \

services/audioflinger/Android.mk

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

    libsonic \

    libmediautils \

    libmemunreachable

    libmemunreachable \

    libmedia_helper



LOCAL_STATIC_LIBRARIES := \

    libcpustats \

    libmedia_helper



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)