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

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

Merge changes Iec785861,I97d074c5 into main am: 74eaca23 

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



Change-Id: I4f36ee0c1cc000a58cf01a5c0645a718c31bb5cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98596bc4 74eaca23

android/app/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ java_library { 


cc_library_shared {

    name: "libbluetooth_jni",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    srcs: ["jni/**/*.cpp"],

    version_script: "libbluetooth_jni.map",

    header_libs: [
@@ -126,6 +126,7 @@ cc_library_shared { 
        "libmodpb64",

        "libopus",

        "libosi",

        "libprotobuf-cpp-lite",

        "libudrv-uipc",

        "libutils",

    ],
@@ -149,7 +150,7 @@ cc_library_shared { 


cc_library {

    name: "libbluetooth-core",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    header_libs: [

        "jni_headers",

        "libbluetooth_headers",

system/bta/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ package { 


cc_defaults {

    name: "fluoride_bta_defaults",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    local_include_dirs: [

        "dm",

        "hd",

system/btcore/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ package { 


cc_defaults {

    name: "libbtcore_defaults",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    local_include_dirs: ["include"],

    include_dirs: [

        "packages/modules/Bluetooth/system",
@@ -36,7 +36,7 @@ cc_defaults { 


cc_library_static {

    name: "libbthalutils",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    srcs: [

        "src/hal_util.cc",

    ],

system/btif/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ genrule { 


cc_library_static {

    name: "libbtif",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    include_dirs: btifCommonIncludes,

    srcs: [

        // AVRCP Target Service
@@ -166,7 +166,7 @@ cc_library_static { 


cc_library_static {

    name: "libbtif-core",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    include_dirs: btifCommonIncludes,

    srcs: [

        // Callouts

system/build/Android.bp

+0 −10
Original line number Diff line number Diff line
@@ -82,16 +82,6 @@ cc_defaults { 
    },

}



cc_defaults {

    name: "fluoride_basic_defaults",

    defaults: [

        "fluoride_defaults",

    ],

    static_libs: [

        "libprotobuf-cpp-lite",

    ],

}



cc_defaults {

    name: "fluoride_defaults",

    defaults: [