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

Commit 555af9fe authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge changes I4dd9b681,Idb698e90,Ifb6dc551 am: 63454f8e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2622582



Change-Id: Ifb3bd22f9aa5dbe0e75414dbe91f7e0ab46777f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c31c2aa2 63454f8e

android/app/Android.bp

+27 −10
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ cc_library_shared { 
    name: "libbluetooth_jni",

    defaults: ["fluoride_basic_defaults"],

    srcs: ["jni/**/*.cpp"],

    version_script: "libbluetooth_jni.map",

    header_libs: [

        "jni_headers",

        "libbluetooth_headers",
@@ -66,13 +67,34 @@ 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.

    stl: "libc++_static",

    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 +116,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,

android/app/libbluetooth_jni.map

0 → 100644
+4 −0
Original line number Diff line number Diff line 
{

  global: JNI_OnLoad;

  local: *;

};