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

Commit bd87082d authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Remove libstatslog_bt from fluoride_defaults" into main am: 6a102688 

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



Change-Id: I3351730d8f3b35053b619100148e1ce182a9382d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f9e7374 6a102688

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ cc_library_shared { 
        "libopus",

        "libosi",

        "libprotobuf-cpp-lite",

        "libstatslog_bt",

        "libudrv-uipc",

        "libutils",

    ],

system/bta/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ cc_test { 
        "libbtcore",

        "libchrome",

        "libosi",

        "libstatslog_bt",

    ],

}

system/btif/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ cc_library_static { 
        "libaudio-a2dp-hw-utils",

        "libbt-audio-hal-interface",

        "libbt-stack-core",

        "libstatslog_bt",

    ],

    shared_libs: [

        "libcrypto",
@@ -304,6 +305,7 @@ cc_test { 
        "libopus",

        "libosi",

        "libprotobuf-cpp-lite",

        "libstatslog_bt",

        "libudrv-uipc",

    ],

    whole_static_libs: [
@@ -611,6 +613,7 @@ cc_test { 
        "libcom.android.sysprop.bluetooth",

        "libevent",

        "libgmock",

        "libstatslog_bt",

    ],

    cflags: ["-DBUILDCFG"],

    target: {
@@ -743,6 +746,7 @@ cc_test { 
        "libcom.android.sysprop.bluetooth",

        "libevent",

        "libgmock",

        "libstatslog_bt",

    ],

    cflags: ["-DBUILDCFG"],

    target: {

system/build/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -63,9 +63,6 @@ cc_defaults { 
    defaults: [

        "fluoride_defaults_fuzzable",

    ],

    static_libs: [

        "libstatslog_bt",

    ],

    target: {

        darwin: {

            // libstatslog_bt -> libbinder doesn't build on mac

system/common/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ cc_library_static { 
                ":bluetooth-metrics-proto",

                "metrics.cc",

            ],

            static_libs: ["libstatslog_bt"],

        },

        host: {

            srcs: ["metrics_linux.cc"],