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

Commit 8fb0ea9d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove libbluetooth_gd from fluoride_defaults" into main am: 4ad14a62 

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



Change-Id: I917eb6b3660003760428dab3a653b23a447d0b97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 833c8411 4ad14a62

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ cc_library_shared { 
        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_core_rs_bridge",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-bta",

        "libbt-bta-core",

system/bta/Android.bp

+13 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ cc_library_static { 
    static_libs: [

        "avrcp-target-service",

        "lib-bt-packets",

        "libbluetooth_gd",

        "libbt-bta-core",

        "libcom.android.sysprop.bluetooth",

    ],
@@ -239,6 +240,7 @@ cc_test { 
    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-bta",

        "libbt-bta-core",
@@ -284,6 +286,7 @@ cc_test { 
    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-bta",

        "libbt-bta-core",
@@ -401,6 +404,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbtcore",

        "libbtdevice",
@@ -461,6 +465,7 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth_gd",

        "libbt-common",

        "libchrome",

        "libgmock",
@@ -504,6 +509,7 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth_gd",

        "libbt-common",

        "libchrome",

        "libgmock",
@@ -558,6 +564,7 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth_gd",

        "libbt-common",

        "libchrome",

        "libgmock",
@@ -721,6 +728,7 @@ cc_test { 
        "liblog", // __android_log_print

    ],

    static_libs: [

        "libbluetooth_gd",

        "libbt-common",

        "libchrome",

        "libevent",
@@ -791,6 +799,7 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-common",

        "libchrome",
@@ -854,6 +863,7 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth_gd",

        "libbt-common",

        "libchrome",

        "libgmock",
@@ -906,6 +916,7 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "libbluetooth_gd",

        "libbt-common",

        "libchrome",

        "libgmock",
@@ -1029,6 +1040,7 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth_gd",

        "libbt-common",

        "libchrome",

        "libgmock",
@@ -1090,6 +1102,7 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth_gd",

        "libbt-common",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

system/btif/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_gd",

        "libchrome",

        "libosi",

    ],
@@ -413,6 +414,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libchrome",

        "libevent",
@@ -595,6 +597,7 @@ cc_test { 
        "lib-bt-packets-base",

        "libaudio-a2dp-hw-utils",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-sbc-decoder",

        "libbt-sbc-encoder",
@@ -728,6 +731,7 @@ cc_test { 
        "lib-bt-packets-base",

        "libaudio-a2dp-hw-utils",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-sbc-decoder",

        "libbt-sbc-encoder",

system/build/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ cc_defaults { 
        "fluoride_defaults_fuzzable",

    ],

    static_libs: [

        "libbluetooth_gd",

        "libstatslog_bt",

    ],

    target: {

system/device/Android.bp

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

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbtcore",

        "libbtdevice",

        "libchrome",