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

Commit a085e3e6 authored by Richard Gaywood's avatar Richard Gaywood Committed by Automerger Merge Worker
Browse files

Merge "Revert "check check, is anyone there? *static*"" into tm-dev am: 55bd8508 

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

Change-Id: I7877670aa9564dff2d66d1430051164379fb64e0
parents fe46440a 55bd8508

android/app/Android.bp

+9 −2
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ java_library { 


cc_library_shared {

    name: "libbluetooth_jni",

    defaults: ["fluoride_full_defaults"],

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

    header_libs: [

        "jni_headers",
@@ -61,9 +60,14 @@ cc_library_shared { 
    include_dirs: [

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

    ],

    shared_libs: [

        "libbase",

        "libchrome",

        "liblog",

        "libnativehelper",

    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth",

    ],

    cflags: [

        "-Wall",
@@ -74,6 +78,9 @@ cc_library_shared { 
    sanitize: {

        scs: true,

    },

    apex_available: [

        "com.android.bluetooth",

    ],

    min_sdk_version: "current",

}

android/app/jni/com_android_bluetooth_a2dp.cpp

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#define LOG_TAG "BluetoothA2dpServiceJni"



#define LOG_NDEBUG 0



#include "com_android_bluetooth.h"

#include "hardware/bt_av.h"

#include "utils/Log.h"

android/app/jni/com_android_bluetooth_a2dp_sink.cpp

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#define LOG_TAG "BluetoothA2dpSinkServiceJni"



#define LOG_NDEBUG 0



#include "com_android_bluetooth.h"

#include "hardware/bt_av.h"

#include "utils/Log.h"

android/app/jni/com_android_bluetooth_avrcp_controller.cpp

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#define LOG_TAG "BluetoothAvrcpControllerJni"



#define LOG_NDEBUG 0



#include "com_android_bluetooth.h"

#include "hardware/bt_rc.h"

#include "utils/Log.h"

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+0 −8
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ 
#include <pthread.h>



using bluetooth::Uuid;

#ifndef DYNAMIC_LOAD_BLUETOOTH

extern bt_interface_t bluetoothInterface;

#endif



namespace android {

// Both
@@ -849,10 +846,6 @@ static bt_os_callouts_t sBluetoothOsCallouts = { 
};



int hal_util_load_bt_library(const bt_interface_t** interface) {

#ifndef DYNAMIC_LOAD_BLUETOOTH

  *interface = &bluetoothInterface;

  return 0;

#else

  const char* sym = BLUETOOTH_INTERFACE_STRING;

  bt_interface_t* itf = nullptr;
@@ -882,7 +875,6 @@ error: 
  if (handle) dlclose(handle);



  return -EINVAL;

#endif

}



static void classInitNative(JNIEnv* env, jclass clazz) {