commit 152db314f497fa5ac572dfc897c3b5b1b8dd2409
author Henri Chataing <henrichataing@google.com> Mon Oct 23 18:55:44 2023 -0700
committer Henri Chataing <henrichataing@google.com> Mon Oct 23 18:55:44 2023 -0700
tree 02c11dc62910560bf917634502bec9efb44e6ab4
parent 5e8ba418ce1546039a055ef0519a398db4699c1c

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

system/btif/Android.bp

diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index acaf572..fd797ae 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -523,6 +523,7 @@
     static_libs: [
         "libbluetooth-types",
         "libbt_shim_bridge",
+        "libbt_shim_ffi",
         "libchrome",
         "libcom.android.sysprop.bluetooth",
         "libosi",

system/gd/os/log.h

diff --git a/system/gd/os/log.h b/system/gd/os/log.h
index 0962efd..9e36f8a 100644
--- a/system/gd/os/log.h
+++ b/system/gd/os/log.h
@@ -163,18 +163,8 @@
         ##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__)