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

Commit 152db314 authored by Henri Chataing's avatar Henri Chataing
Browse files

gd: Fix compilation issues caused by init flags 

- Remove use of init flags in logging outside android / floss
  build environment
- Add missing library dependency libbt_shim_ffi to
  net_test_btif_hf_client_service

Bug: 305066880
Test: m com.android.btservices
Change-Id: Ib5ae419193bff22aa27b5ec5e89a167b6e668569
parent 5e8ba418

system/btif/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -523,6 +523,7 @@ cc_test { 
    static_libs: [

        "libbluetooth-types",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libosi",

system/gd/os/log.h

+2 −12
Original line number Diff line number Diff line
@@ -163,18 +163,8 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG should never be NULL"); 
        ##args);                                                                                                    \

  } while (false)



#define LOG_VERBOSE_INT(fmt, args...)                                                  \

  do {                                                                                 \

    if (bluetooth::common::InitFlags::GetLogLevelForTag(LOG_TAG) >= LOG_TAG_VERBOSE) { \

      LOGWRAPPER(fmt, ##args);                                                         \

    }                                                                                  \

  } while (false)

#define LOG_DEBUG_INT(fmt, args...)                                                  \

  do {                                                                               \

    if (bluetooth::common::InitFlags::GetLogLevelForTag(LOG_TAG) >= LOG_TAG_DEBUG) { \

      LOGWRAPPER(fmt, ##args);                                                       \

    }                                                                                \

  } while (false)

#define LOG_VERBOSE_INT(...) LOGWRAPPER(__VA_ARGS__)

#define LOG_DEBUG_INT(...) LOGWRAPPER(__VA_ARGS__)

#define LOG_INFO_INT(...) LOGWRAPPER(__VA_ARGS__)

#define LOG_WARN_INT(...) LOGWRAPPER(__VA_ARGS__)

#define LOG_ERROR_INT(...) LOGWRAPPER(__VA_ARGS__)