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

Commit 4a61469e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "check check, is anyone there? *static*"" into tm-dev am: 01ce2cf6 

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

Change-Id: I7ee86287c678869ced7910214865402e59117c52
parents e96365bd 01ce2cf6

android/app/Android.bp

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


cc_library_shared {

    name: "libbluetooth_jni",

    defaults: ["fluoride_full_defaults"],

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

    header_libs: [

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

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

    ],

    shared_libs: [

        "libbase",

        "libchrome",

        "liblog",

        "libnativehelper",

    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth",

    ],

    cflags: [

        "-Wall",
@@ -145,7 +141,19 @@ android_app { 
    optimize: {

        enabled: false,

    },

    required: ["libbluetooth"],

    required: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.1",

        "android.hardware.bluetooth.audio-V1-ndk",

        "audio_set_configurations_bfbs",

        "audio_set_configurations_json",

        "audio_set_scenarios_bfbs",

        "audio_set_scenarios_json",

        "bt_did.conf",

        "bt_stack.conf",

    ],

    apex_available: [

        "com.android.bluetooth",

    ],

android/app/jni/com_android_bluetooth_a2dp.cpp

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


#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

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


#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

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


#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

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



using bluetooth::Uuid;

#ifndef DYNAMIC_LOAD_BLUETOOTH

extern bt_interface_t bluetoothInterface;

#endif



namespace android {

// Both
@@ -846,6 +849,10 @@ 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;
@@ -875,6 +882,7 @@ error: 
  if (handle) dlclose(handle);



  return -EINVAL;

#endif

}



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