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

Commit f3081e30 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

hw/bluetooth.default.so -> libbluetooth.so (2/2) 

Also rename the build goal for both the library and headers.

Bug: 67853426
Test: run Bluetooth
Merged-In: I4c2a86fd73da9b4bcad932acc185c844a3c35e3f
Change-Id: I4c2a86fd73da9b4bcad932acc185c844a3c35e3f
(cherry picked from commit 2005718d274ae6668dc3069e4119b08051cbc07a)
parent eb8b8638

android/app/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ 
        android-support-v4

LOCAL_PROTOC_OPTIMIZE_TYPE := micro



LOCAL_REQUIRED_MODULES := bluetooth.default

LOCAL_REQUIRED_MODULES := libbluetooth



LOCAL_PROGUARD_ENABLED := disabled

android/app/jni/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ cc_library_shared { 
        "com_android_bluetooth_gatt.cpp",

        "com_android_bluetooth_sdp.cpp",

    ],

    header_libs: ["bluetooth.default_headers"],

    header_libs: ["libbluetooth_headers"],

    include_dirs: [

        "libnativehelper/include/nativehelper",

        "system/bt/types",

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+3 −7
Original line number Diff line number Diff line
@@ -587,11 +587,7 @@ static bt_os_callouts_t sBluetoothOsCallouts = { 
    acquire_wake_lock_callout, release_wake_lock_callout,

};



#if defined(__LP64__)

#define BLUETOOTH_LIBRARY_NAME "/system/lib64/hw/bluetooth.default.so"

#else

#define BLUETOOTH_LIBRARY_NAME "/system/lib/hw/bluetooth.default.so"

#endif

#define BLUETOOTH_LIBRARY_NAME "libbluetooth.so"



int hal_util_load_bt_library(const bt_interface_t** interface) {

  const char* sym = BLUETOOTH_INTERFACE_STRING;
@@ -602,8 +598,8 @@ int hal_util_load_bt_library(const bt_interface_t** interface) { 
  void* handle = dlopen(path, RTLD_NOW);

  if (!handle) {

    const char* err_str = dlerror();

    LOG(ERROR) << __func__ << ": failed to load Bluetooth library " << path

               << ", error=" << (err_str ? err_str : "error unknown");

    LOG(ERROR) << __func__ << ": failed to load Bluetooth library, error="

               << (err_str ? err_str : "error unknown");

    goto error;

  }