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

Commit ae01e9b3 authored by William Escande's avatar William Escande
Browse files

Revert^2 "check check, is anyone there? *static*" 

check check, is anyone there? *static*

* statically link libbluetooth into libbluetooth_jni
* clean up some build rule defaults
* statically link libchrome
* stop using whole static libs, to increase ability to prune unused code
* remove required libbluetooth
* statically link libstatlog_bt in a few location

:party:
:party:

Still some issue on local test. I suppose they should only be run in
the test suite. Test are:
* bluetooth-test-audio-hal-interface
* bluetooth_flatbuffer_bundler_test
* net_test_rfcomm_suite
* net_test_stack_rfcomm

Bug: 220805766
Test: compile, verify BT boots & basic use cases work
Testeted with all cc_test in packages/modules/Bluetooth:
`atest $(grep -w cc_test -A 1 $(find packages/modules/Bluetooth -name Android.bp) | grep name | cut -d '"' -f 2)`
Test: m bluetoothtbd
Test: atest bluetoothtbd_test
Test: m libstatslog_bt bt_headless libbluetooth_gd libbtif libbt-common bluetooth_stack_with_facade bluetooth_test_gd_unit bluetooth_gd_fuzz_test libbt_audio_hal_a2dp_encoding_fuzzer

Ignore-AOSP-First: apex changes not in AOSP yet

e634b3db

Change-Id: I99ea709fe591ca362208547051d7fd5810ed42ed
parent 35678171

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) {