diff options
| author | Chris Manton <cmanton@google.com> | 2022-02-07 22:25:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-07 22:25:06 +0000 |
| commit | 0ec5489c63f295ff93f66ecaa76a6058a43b39a5 (patch) | |
| tree | c1ca4c7adae32ccd29d528389d01397430fb3cea | |
| parent | fb7d193210c3cd486708b2454c3c9b5b0ae5b301 (diff) | |
| parent | b1bee49cc9f90af45044ad07c257e2054fcb2687 (diff) | |
Remove dynamic legacy module lookup aka STATIC_LIBBLUETOOTH am: b029de5792 am: 60ad0d7655 am: b1bee49cc9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1959428
Change-Id: I9c410c5294643ad73d1e04064c7e40ed50812926
| -rw-r--r-- | system/BUILD.gn | 7 | ||||
| -rw-r--r-- | system/btcore/Android.bp | 1 | ||||
| -rw-r--r-- | system/btif/Android.bp | 1 | ||||
| -rw-r--r-- | system/btif/src/stack_manager.cc | 8 |
4 files changed, 0 insertions, 17 deletions
diff --git a/system/BUILD.gn b/system/BUILD.gn index ec765f8ad3..08c6e1d740 100644 --- a/system/BUILD.gn +++ b/system/BUILD.gn @@ -125,13 +125,6 @@ config("target_defaults") { "BTIF_HF_FEATURES=0x00000000" ] - # If not configured as a dynamic library, default to static library - if (!(defined(use.bt_dynlib) && use.bt_dynlib)) { - defines += [ - "STATIC_LIBBLUETOOTH", - ] - } - if (!(defined(use.bt_nonstandard_codecs) && use.bt_nonstandard_codecs)) { defines += [ "EXCLUDE_NONSTANDARD_CODECS" ] } diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp index a9b43f45ec..371af6fc3b 100644 --- a/system/btcore/Android.bp +++ b/system/btcore/Android.bp @@ -47,7 +47,6 @@ cc_library_static { cc_library_static { name: "libbtcore-static", defaults: ["libbtcore_defaults"], - cflags: ["-DSTATIC_LIBBLUETOOTH"], } cc_library_headers { diff --git a/system/btif/Android.bp b/system/btif/Android.bp index 60f1eebc7f..92f14ea6e5 100644 --- a/system/btif/Android.bp +++ b/system/btif/Android.bp @@ -209,7 +209,6 @@ cc_library_static { cc_library_static { name: "libbtif-static", defaults: ["libbtif_defaults"], - cflags: ["-DSTATIC_LIBBLUETOOTH"], } // btif unit tests for target diff --git a/system/btif/src/stack_manager.cc b/system/btif/src/stack_manager.cc index a04a9cc8ab..fe730e7d6e 100644 --- a/system/btif/src/stack_manager.cc +++ b/system/btif/src/stack_manager.cc @@ -21,10 +21,8 @@ #include "btif/include/stack_manager.h" #include <hardware/bluetooth.h> -#if defined(STATIC_LIBBLUETOOTH) #include <cstdlib> #include <cstring> -#endif #include "btcore/include/module.h" #include "btcore/include/osi_module.h" @@ -194,7 +192,6 @@ static bool get_stack_is_running() { return stack_is_running; } // Internal functions -#ifdef STATIC_LIBBLUETOOTH extern const module_t bt_utils_module; extern const module_t bte_logmsg_module; extern const module_t btif_config_module; @@ -238,11 +235,6 @@ inline const module_t* get_local_module(const char* name) { LOG_ALWAYS_FATAL("Cannot find module %s, aborting", name); return nullptr; } -#else -inline const module_t* get_local_module(const char* name) { - return get_module(name); -} -#endif // Synchronous function to initialize the stack static void event_init_stack(void* context) { |