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

Commit c6ac217f authored by David Duarte's avatar David Duarte
Browse files

Move shared_libs with a static variant to static_libs 

APEXes embbed copies of transitive dependencies meaning that
most shared libraries are not shared with the rest of the system.
In this case static linking is a net gain as the dependency is
still copied but we allow the linker to do more optimisations.

This reduces the APEX size by 0.67M.

Bug: 265285999
Test: m com.android.btservices
Change-Id: Ifb6dc5511a6d22b14d0a54e100f12aec43c5ae3b
parent 6c8488ce

android/app/Android.bp

+25 −10
Original line number Diff line number Diff line
@@ -66,13 +66,33 @@ cc_library_shared { 
        "packages/modules/Bluetooth/system/gd",

        "packages/modules/Bluetooth/system/types",

    ],

    // libbluetooth_jni is the jni lib included in the btservices apex.

    // As this library is inside an APEX the shared_libs that does not

    // expose stubs are copied inside it. As a result using those as

    // shared libraries is less interesting as they are not shared, so we link

    // them statically to allow the linker to perform more optimisation.

    //

    // The only exception to this is libcrypto because the shared version

    // is required to maintain FIPS compliance.

    static_libs: [

        "android.hardware.audio.common-V1-ndk",

        "android.hardware.audio.common@5.0",

        "android.hardware.bluetooth.audio-V3-ndk",

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.1",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "android.media.audio.common.types-V2-ndk",

        "android.system.suspend-V1-ndk",

        "android.system.suspend.control-V1-ndk",

        "avrcp-target-service",

        "lib-bt-packets-avrcp",

        "lib-bt-packets-base",

        "libFraunhoferAAC",

        "libaudio-a2dp-hw-utils",

        "libbase",

        "libbluetooth",

        "libbluetooth-dumpsys",

        "libbluetooth-types",
@@ -94,31 +114,26 @@ cc_library_shared { 
        "libbtif-core",

        "libc++fs",

        "libchrome",

        "libcutils",

        "libevent",

        "libfmq",

        "libg722codec",

        "libhidlbase",

        "liblc3",

        "libmodpb64",

        "libopus",

        "libosi",

        "libudrv-uipc",

        "libutils",

    ],

    shared_libs: [

        "android.hardware.bluetooth.audio-V3-ndk",

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.1",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "android.system.suspend-V1-ndk",

        "libaaudio",

        "libbinder_ndk",

        "libcrypto",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "liblog",

        "libnativehelper",

        "libstatssocket",

        "libutils",

        "libvndksupport",

    ],

    sanitize: {

        scs: true,