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

Commit b26a9311 authored by Antoine Soulier's avatar Antoine Soulier Committed by Automerger Merge Worker
Browse files

Merge "test: Link statically with libbase due to ABI incompabilities" into main am: 5edd7bab 

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



Change-Id: Ibc728e53c5f800e52b5a192cc6ff0f270f3ff10b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c8faa8bc 5edd7bab

system/gd/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -473,6 +473,7 @@ cc_test { 
        "BluetoothGeneratedDumpsysTestData_h",

        "BluetoothGeneratedDumpsysTestData_h",

    ],

    ],

    static_libs: [

    static_libs: [

        "libbase",

        "libbluetooth-protos",

        "libbluetooth-protos",

        "libbluetooth-types",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_crypto_toolbox",
@@ -496,7 +497,6 @@ cc_test { 
    ],

    ],

    shared_libs: [

    shared_libs: [

        "libPlatformProperties",

        "libPlatformProperties",

        "libbase",

        "libcrypto",

        "libcrypto",

        "server_configurable_flags",

        "server_configurable_flags",

    ],

    ],