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

Commit 57788f96 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by Automerger Merge Worker
Browse files

Merge "Remove static libcutils and libutils dependencies" am: 3a4272f5 am: 9c08e4cc 

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



Change-Id: I1472412ccbf75769ef92d17d1436dcb085720956
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 349a9bca 9c08e4cc

system/btcore/fuzzer/Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -37,11 +37,9 @@ cc_defaults { 
        "liblog",

        "liblog",

        "libbase",

        "libbase",

        "libevent",

        "libevent",

        "libutils",

        "libbtcore",

        "libbtcore",

        "libchrome",

        "libchrome",

        "libmodpb64",

        "libmodpb64",

        "libhidlbase",

        "libvndksupport",

        "libvndksupport",

        "libbt-common",

        "libbt-common",

        "libbluetooth-types",

        "libbluetooth-types",

system/build/Android.bp

+5 −1
Original line number Original line Diff line number Diff line
@@ -80,6 +80,11 @@ fluoride_defaults { 
                misc_undefined: ["bounds"],

                misc_undefined: ["bounds"],

            },

            },

        },

        },

        host: {

            static_libs: [

                "libcutils",

            ]

        }

    },

    },

    defaults: ["fluoride_types_defaults_fuzzable"],

    defaults: ["fluoride_types_defaults_fuzzable"],

    header_libs: ["libbluetooth_headers", "libbt_callbacks_cxx_headers"],

    header_libs: ["libbluetooth_headers", "libbt_callbacks_cxx_headers"],
@@ -93,7 +98,6 @@ fluoride_defaults { 
        "libbluetooth-types",

        "libbluetooth-types",

        "libbt-platform-protos-lite",

        "libbt-platform-protos-lite",

        "libbluetooth_rust_interop",

        "libbluetooth_rust_interop",

        "libcutils",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "liblog",

        "liblog",

system/device/Android.bp

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

        "libbtcore",

        "libosi",

        "libosi",

        "libosi-AllocationTestHarness",

        "libosi-AllocationTestHarness",

        "libcutils",

        "libbluetooth-types",

        "libbluetooth-types",

    ],

    ],

}
 
}

system/hci/Android.bp

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

        "libosi",

        "libosi-AlarmTestHarness",

        "libosi-AlarmTestHarness",

        "libosi-AllocationTestHarness",

        "libosi-AllocationTestHarness",

        "libcutils",

        "libbtcore",

        "libbtcore",

        "libbt-protos-lite",

        "libbt-protos-lite",

        "libbluetooth-for-tests",

        "libbluetooth-for-tests",

system/service/Android.bp

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

        "libgmock",

        "liblog",

        "liblog",

        "libbluetooth-types",

        "libbluetooth-types",

        "libutils",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libchrome",

        "libchrome",