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

Commit 39366fb5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove android.hardware.bluetooth from defaults" am: 1fbed985 am: 3ad24414 

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



Change-Id: I1c74f413d39f3c0e888c4b5128bbffdd4e60c47e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9c77fd9 3ad24414

android/app/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ cc_library_shared { 
        "libc++fs",

        "libbluetooth_core_rs_bridge",

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

    ],

    sanitize: {

        scs: true,

    },

system/build/Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -220,8 +220,6 @@ cc_defaults { 
                "android.hardware.bluetooth.audio@2.0",

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

                "android.hardware.bluetooth.audio-V3-ndk",

                "android.hardware.bluetooth@1.0",

                "android.hardware.bluetooth@1.1",

                "android.system.suspend-V1-ndk",

                "libaaudio",

                "libbinder_ndk",
@@ -240,8 +238,6 @@ cc_defaults { 
            shared_libs: [

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

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

                "android.hardware.bluetooth@1.0",

                "android.hardware.bluetooth@1.1",

                "libbinder_ndk",

                "libcutils",

                "libhidlbase",
@@ -301,8 +297,6 @@ cc_defaults { 
        },

        host_linux: {

            shared_libs: [

                "android.hardware.bluetooth@1.0",

                "android.hardware.bluetooth@1.1",

                "libcutils",

                "libhidlbase",

                "libstatslog_bt",
@@ -311,8 +305,6 @@ cc_defaults { 
        },

        android: {

            shared_libs: [

                "android.hardware.bluetooth@1.0",

                "android.hardware.bluetooth@1.1",

                "libcutils",

                "libhidlbase",

                "libstatssocket",

system/main/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ cc_library { 
    whole_static_libs: [

        "libbluetooth_core_rs",

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

    ],

    // Shared library link options.

    // References to global symbols and functions should bind to the library

    // itself. This is to avoid issues with some of the unit/system tests

system/test/suite/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -122,4 +122,8 @@ cc_test { 
        "gatt/gatt_test.cc",

        "gatt/gatt_unittest.cc",

    ],

    static_libs: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

    ],

}