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

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

Do not link to libprotobuf-cpp-lite dynamically in tests 

U MTS tests need to run on T, the tests that
link dynamically to protobuf currently fails on T
with `cannot locate symbol "_ZN6google8protobuf8internal28init_protobuf_defaults_stateE"`

Remove protobuf from target that don't need it and move it
to static_libs for where it's used

Bug: 266996401
Test: TreeHugger
Change-Id: If946cf88bcc6c9ff37c8777521ac6b2dba674f75
parent 27335707

system/bta/Android.bp

+0 −11
Original line number Diff line number Diff line
@@ -203,7 +203,6 @@ cc_test { 
        "android.hardware.bluetooth.audio@2.1",

        "libcrypto",

        "liblog",

        "libprotobuf-cpp-lite",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",
@@ -293,7 +292,6 @@ cc_test { 
        "libbase",

        "libcrypto",

        "liblog",

        "libprotobuf-cpp-lite",

    ],

    static_libs: [

        "libbluetooth-types",
@@ -378,7 +376,6 @@ cc_test { 
        "test/common/btm_api_mock.cc",

    ],

    shared_libs: [

        "libprotobuf-cpp-lite",

        "libcrypto",

    ],

    static_libs : [
@@ -421,7 +418,6 @@ cc_test { 
        "groups/groups.cc",

    ],

    shared_libs: [

        "libprotobuf-cpp-lite",

        "libcrypto",

    ],

    static_libs : [
@@ -475,7 +471,6 @@ cc_test { 
        "vc/vc_test.cc",

    ],

    shared_libs: [

        "libprotobuf-cpp-lite",

        "libcrypto",

    ],

    static_libs : [
@@ -634,7 +629,6 @@ cc_test { 
        "LeAudioSetConfigSchemas_h",

    ],

    shared_libs: [

        "libprotobuf-cpp-lite",

        "libcrypto",

        "liblog",  // __android_log_print

        "android.hardware.bluetooth.audio@2.0",
@@ -702,7 +696,6 @@ cc_test { 
        "android.hardware.bluetooth.audio@2.0",

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

        "libhidlbase",

        "libprotobuf-cpp-lite",

        "libcrypto",

        "liblog",

        "libfmq",
@@ -778,7 +771,6 @@ cc_test { 
        ":TestCommonStackConfig",

    ],

    shared_libs: [

        "libprotobuf-cpp-lite",

        "libcrypto",

    ],

    static_libs : [
@@ -835,7 +827,6 @@ cc_test { 
        ":TestCommonStackConfig",

    ],

    shared_libs: [

        "libprotobuf-cpp-lite",

        "libcrypto",

        "libfmq",

        "libbinder_ndk",
@@ -906,7 +897,6 @@ cc_test { 
        ":TestStubOsi",

    ],

    shared_libs: [

        "libprotobuf-cpp-lite",

        "libcrypto",

    ],

    static_libs : [
@@ -970,7 +960,6 @@ cc_test { 
        "test/bta_hh_test.cc",

    ],

    shared_libs: [

        "libprotobuf-cpp-lite",

        "libcrypto",

    ],

    static_libs : [

system/btif/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ cc_test { 
        "libcrypto",

        "libfmq",

        "libhidlbase",

        "libprotobuf-cpp-lite",

        "libprocessgroup",

    ],

    static_libs: [
@@ -289,6 +288,7 @@ cc_test { 
        "liblc3",

        "libopus",

        "libosi",

        "libprotobuf-cpp-lite",

        "libudrv-uipc",

   ],

    whole_static_libs: [
@@ -361,7 +361,6 @@ cc_test { 
        "libcrypto",

        "libcutils",

        "liblog",

        "libprotobuf-cpp-lite",

    ],

    static_libs: [

        "libbluetooth-types",

system/build/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ fluoride_defaults { 
    shared_libs: [

        "libcrypto",

        "liblog",

        "libprotobuf-cpp-lite",

    ],

    static_libs: [

        "libbt-common",

system/common/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -78,10 +78,10 @@ cc_test { 
        },

    },

    shared_libs: [

        "libprotobuf-cpp-lite",

        "libcrypto",

    ],

    static_libs: [

        "libprotobuf-cpp-lite",

        "libgmock",

        "libbt-common",

        "libbt-protos-lite",

system/main/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ cc_test { 
    ],

    shared_libs: [

        "libcrypto",

        "libprotobuf-cpp-lite",

    ],

    sanitize: {

        address: true,