Introduce libbt-jni-thread am: a3ffb7b am: a86bada

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2858567 Change-Id: I90ee40dd7c34f51e45dd4fbe38c6f62360cf7e7c Signed-off-by: Automerger Merge Worker <[email protected]>
realme-mt6781-dev · Dec 14, 2023 · f0e3f6d · f0e3f6d
2 parents fd1c6ed + a86bada
commit f0e3f6d
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h
@@ -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"

diff --git a/system/btif/Android.bp b/system/btif/Android.bp
@@ -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"],

diff --git a/system/btif/src/btif_jni_task.cc b/system/btif/src/btif_jni_task.cc
@@ -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"

diff --git a/system/stack/include/sdp_device_id.h b/system/stack/include/sdp_device_id.h
@@ -20,7 +20,7 @@
 
 #include <cstdint>
 
-#include "bt_target.h"
+#include "internal_include/bt_target.h"
 
 /* Device Identification (DI) data structure
  */