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

Commit 2423b5b7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I452a1f1b,If6100f61 into main 

* changes:
  Correctly link to bluetooth_flags_c_lib
  Use proper dependency instead of self override
parents e6f17dd8 af41be3f

system/audio_hal_interface/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ cc_library_static { 
        "libutils",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbluetooth_log",

        "libbt-common",

        "libbt_shim_bridge",
@@ -302,6 +303,7 @@ cc_test { 
        "libfmq",

        "liblog",

        "libstatslog",

        "libcutils",

        "libutils",

        "server_configurable_flags",

    ],
@@ -318,6 +320,7 @@ cc_test { 
        "libchrome",

        "libevent",

        "libgmock",

        "server_configurable_flags",

    ],

    cflags: [

        "-DBUILDCFG",
@@ -350,7 +353,9 @@ cc_test { 
    static_libs: [

        "libbt-bta",

        "libbt-platform-protos-lite",

        "libcutils",

        "libgmock",

        "server_configurable_flags",

    ],

    header_libs: ["libbluetooth_headers"],

    cflags: [

system/audio_hal_interface/aidl/le_audio_utils_unittest.cc

+0 −8
Original line number Diff line number Diff line
@@ -28,14 +28,6 @@ 
#include "bta/le_audio/le_audio_types.h"

#include "btm_iso_api_types.h"



namespace server_configurable_flags {

std::string GetServerConfigurableFlag(const std::string& /* experiment_category_name */,

                                      const std::string& /* experiment_flag_name */,

                                      const std::string& /* default_value */) {

  return "";

}

}  // namespace server_configurable_flags



namespace bluetooth {

namespace {

system/audio_hal_interface/le_audio_software_unittest.cc

+0 −8
Original line number Diff line number Diff line
@@ -486,14 +486,6 @@ namespace bluetooth::le_audio::broadcaster { 
std::ostream& operator<<(std::ostream& os, const BroadcastConfiguration&) { return os; }

}  // namespace bluetooth::le_audio::broadcaster



namespace server_configurable_flags {

std::string GetServerConfigurableFlag(const std::string& /* experiment_category_name */,

                                      const std::string& /* experiment_flag_name */,

                                      const std::string& /* default_value */) {

  return "";

}

}  // namespace server_configurable_flags



namespace {



bluetooth::common::MessageLoopThread message_loop_thread("test message loop");

system/bta/Android.bp

+14 −1
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",
@@ -823,10 +824,12 @@ cc_test { 
    shared_libs: [

        "libbase",

        "libcrypto",

        "libcutils",

        "libhidlbase",

        "liblog", // __android_log_print

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",
@@ -841,6 +844,7 @@ cc_test { 
        "libflatbuffers-cpp",

        "libgmock",

        "libosi",

        "server_configurable_flags",

    ],

    sanitize: {

        cfi: false,
@@ -937,6 +941,7 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",
@@ -1019,11 +1024,12 @@ cc_test { 
        "libaconfig_storage_read_api_cc",

        "libbase",

        "libcrypto",

        "libcutils",

        "libhidlbase",

        "liblog",

        "server_configurable_flags",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",
@@ -1041,6 +1047,7 @@ cc_test { 
        "libgtest",

        "liblc3",

        "libosi",

        "server_configurable_flags",

    ],

    data: [

        ":audio_set_configurations_bfbs",
@@ -1118,6 +1125,7 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",
@@ -1187,12 +1195,14 @@ cc_test { 
        "libbase",

        "libbinder_ndk",

        "libcrypto",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "liblog",

        "server_configurable_flags",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbluetooth_hci_pdl",
@@ -1210,6 +1220,7 @@ cc_test { 
        "libgtest",

        "liblc3",

        "libosi",

        "server_configurable_flags",

    ],

    sanitize: {

        cfi: true,
@@ -1335,6 +1346,7 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",
@@ -1407,6 +1419,7 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

system/bta/le_audio/broadcaster/broadcaster_test.cc

+0 −8
Original line number Diff line number Diff line
@@ -84,14 +84,6 @@ static base::Callback<void(BT_OCTET8)> generator_cb; 


void btsnd_hcic_ble_rand(base::Callback<void(BT_OCTET8)> cb) { generator_cb = cb; }



namespace server_configurable_flags {

std::string GetServerConfigurableFlag(const std::string& experiment_category_name,

                                      const std::string& experiment_flag_name,

                                      const std::string& default_value) {

  return "";

}

}  // namespace server_configurable_flags



std::atomic<int> num_async_tasks;

bluetooth::common::MessageLoopThread message_loop_thread("test message loop");

bluetooth::common::MessageLoopThread* get_main_thread() { return &message_loop_thread; }