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

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

Merge "Embed libbt-protos-lite into libbt-common" into main am: 3fea1e9a 

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



Change-Id: I95478b05c6a82bd5070afaf9f08810eb160ba7d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89484f8e 3fea1e9a

system/bta/Android.bp

+0 −13
Original line number Diff line number Diff line
@@ -243,7 +243,6 @@ cc_test { 
        "libbt-bta",

        "libbt-bta-core",

        "libbt-common",

        "libbt-protos-lite",

        "libbtcore",

        "libchrome",

        "libcom.android.sysprop.bluetooth",
@@ -289,7 +288,6 @@ cc_test { 
        "libbt-bta",

        "libbt-bta-core",

        "libbt-common",

        "libbt-protos-lite",

        "libbtcore",

        "libchrome",

        "libosi",
@@ -404,7 +402,6 @@ cc_test { 
    static_libs: [

        "libbluetooth-types",

        "libbt-common",

        "libbt-protos-lite",

        "libbtcore",

        "libbtdevice",

        "libchrome",
@@ -466,7 +463,6 @@ cc_test { 
    static_libs: [

        "crypto_toolbox_for_tests",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libgmock",

        "libosi",
@@ -510,7 +506,6 @@ cc_test { 
    static_libs: [

        "crypto_toolbox_for_tests",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libgmock",

        "libosi",
@@ -565,7 +560,6 @@ cc_test { 
    static_libs: [

        "crypto_toolbox_for_tests",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libgmock",

        "libosi",
@@ -729,7 +723,6 @@ cc_test { 
    ],

    static_libs: [

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",
@@ -801,7 +794,6 @@ cc_test { 
        "crypto_toolbox_for_tests",

        "libbt-audio-hal-interface",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",
@@ -864,7 +856,6 @@ cc_test { 
    static_libs: [

        "crypto_toolbox_for_tests",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libgmock",

        "libosi",
@@ -917,7 +908,6 @@ cc_test { 
    ],

    static_libs: [

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libgmock",

        "liblc3",
@@ -981,7 +971,6 @@ cc_test { 
    static_libs: [

        "libbt-audio-hal-interface",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libevent",

        "libgmock",
@@ -1042,7 +1031,6 @@ cc_test { 
    static_libs: [

        "crypto_toolbox_for_tests",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libgmock",

    ],
@@ -1104,7 +1092,6 @@ cc_test { 
    static_libs: [

        "crypto_toolbox_for_tests",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libevent",

system/btif/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ cc_test { 
        "libbt-bta-core",

        "libbt-common",

        "libbt-hci",

        "libbt-protos-lite",

        "libbt-sbc-decoder",

        "libbt-sbc-encoder",

        "libbt-stack",
@@ -419,7 +418,6 @@ cc_test { 
    static_libs: [

        "libbluetooth-types",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libevent",

        "libosi-AllocationTestHarness",

system/build/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ cc_defaults { 
    ],

    static_libs: [

        "libbt-common",

        "libbt-protos-lite",

        "libcutils",

        "libgmock",

        "libosi",
@@ -89,7 +88,6 @@ cc_defaults { 
        "fluoride_defaults",

    ],

    static_libs: [

        "libbt-protos-lite",

        "libflatbuffers-cpp",

        "libprotobuf-cpp-lite",

    ],

system/common/Android.bp

+9 −2
Original line number Diff line number Diff line
@@ -28,9 +28,17 @@ cc_library_static { 
        "stop_watch_legacy.cc",

        "time_util.cc",

    ],

    proto: {

        type: "lite",

        canonical_path_from_root: false,

        export_proto_headers: true,

    },

    target: {

        android: {

            srcs: ["metrics.cc"],

            srcs: [

                ":bluetooth-metrics-proto",

                "metrics.cc",

            ],

        },

        host: {

            srcs: ["metrics_linux.cc"],
@@ -88,7 +96,6 @@ cc_test { 
    ],

    static_libs: [

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libevent",

        "libgmock",

system/gd/proto/Android.bp

+2 −11
Original line number Diff line number Diff line
@@ -23,20 +23,11 @@ java_library_static { 
    sdk_version: "current",

}



cc_library_static {

    name: "libbt-protos-lite",

    host_supported: true,

    proto: {

        export_proto_headers: true,

        type: "lite",

    },

filegroup {

    name: "bluetooth-metrics-proto",

    srcs: [

        "bluetooth/metrics/bluetooth.proto",

    ],

    apex_available: [

        "com.android.btservices",

    ],

    min_sdk_version: "30",

}



cc_library_static {