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

Commit a86bada8 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Introduce libbt-jni-thread am: a3ffb7b0 

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



Change-Id: Ia7f0baf4917c2a028aec2620c6385f73ee1cdee6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c06acdac a3ffb7b0

system/bta/include/bta_api.h

+1 −1
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
#include <cstdint>

#include <vector>



#include "bt_target.h"  // Must be first to define build configuration

#include "bta_api_data_types.h"

#include "internal_include/bt_target.h"

#include "macros.h"

#include "os/log.h"

#include "stack/btm/power_mode.h"

system/btif/Android.bp

+25 −0
Original line number Diff line number Diff line
@@ -53,6 +53,31 @@ cc_library { 
    },

}



cc_library_static {

    name: "libbt-jni-thread",

    defaults: ["fluoride_defaults"],

    host_supported: true,

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/gd",

        "packages/modules/Bluetooth/system/include",

        "packages/modules/Bluetooth/system/stack/include",

        "packages/modules/Bluetooth/system/types",

    ],

    srcs: ["src/btif_jni_task.cc"],

    static_libs: [

        "libbt_shim_bridge",

        "libosi",

    ],

    shared_libs: [

        "libchrome",

    ],

    apex_available: [

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",

}



genrule {

    name: "statslog_bt.h",

    tools: ["stats-log-api-gen"],

system/btif/src/btif_jni_task.cc

+5 −0
Original line number Diff line number Diff line
@@ -16,9 +16,14 @@ 


#include "btif/include/btif_jni_task.h"



#include <base/bind.h>

#include <base/location.h>

#include <base/logging.h>

#include <base/threading/platform_thread.h>



#include <cstdint>

#include <utility>



#include "common/message_loop_thread.h"

#include "include/hardware/bluetooth.h"

#include "osi/include/allocator.h"

system/stack/include/sdp_device_id.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include <cstdint>



#include "bt_target.h"

#include "internal_include/bt_target.h"



/* Device Identification (DI) data structure

 */