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

Commit cb29a568 authored by Hui Peng's avatar Hui Peng
Browse files

Factorout macros for FUZZ_TARGET 

Bug: 264946508
Test: mma packages/modules/Bluetooth
Change-Id: Ib373d501d564391901b4601764d0966779e8a242
parent 509d28cd

system/gd/common/audit_log.cc

+4 −4
Original line number Diff line number Diff line
@@ -21,26 +21,26 @@ 
#include "os/log.h"



namespace {

#if defined(__ANDROID__)

#if defined(__ANDROID__) && !defined (FUZZ_TARGET)



// Tags for security logging, should be in sync with

// frameworks/base/core/java/android/app/admin/SecurityLogTags.logtags

constexpr int SEC_TAG_BLUETOOTH_CONNECTION = 210039;



#endif /* defined(__ANDROID__) */

#endif /* defined(__ANDROID__) && !defined (FUZZ_TARGET) */

}  // namespace



namespace bluetooth {

namespace common {



void LogConnectionAdminAuditEvent(const char* action, const hci::Address& address, hci::ErrorCode status) {

#if defined(__ANDROID__)

#if defined(__ANDROID__) && !defined (FUZZ_TARGET)



  android_log_event_list(SEC_TAG_BLUETOOTH_CONNECTION)

      << ADDRESS_TO_LOGGABLE_CSTR(address) << /* success */ int32_t(status == hci::ErrorCode::SUCCESS)

      << common::StringFormat("%s: %s", action, ErrorCodeText(status).c_str()).c_str() << LOG_ID_SECURITY;



#endif /* defined(__ANDROID__) */

#endif /* defined(__ANDROID__) && !defined (FUZZ_TARGET) */

}



}  // namespace common

system/gd/os/log.h

+26 −25
Original line number Diff line number Diff line
@@ -31,19 +31,31 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG should never be NULL"); 
#include "os/log_tags.h"

#include "os/logging/log_adapter.h"



#if defined(__ANDROID__)



#include <log/log.h>

#include <log/log_event_list.h>

#if defined(FUZZ_TARGET)



#ifdef FUZZ_TARGET

#define LOG_VERBOSE(...)

#define LOG_DEBUG(...)

#define LOG_INFO(...)

#define LOG_WARN(...)

#else



static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion");

#define LOG_ERROR(...) do {         \

  fprintf(stderr, __VA_ARGS__);     \

} while (false)



// for fuzz targets, we just

// need to abort in this statement

// to catch the bug

#define LOG_ALWAYS_FATAL(...) do {  \

    fprintf(stderr, __VA_ARGS__);   \

    abort();                        \

  } while (false)



#else /* end of defined(FUZZ_TARGET) */



#if defined(__ANDROID__)



#include <log/log.h>

#include <log/log_event_list.h>



#if __has_include("src/init_flags.rs.h")
@@ -66,10 +78,9 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); 


#define LOG_INFO(fmt, args...) ALOGI("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args)

#define LOG_WARN(fmt, args...) ALOGW("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args)

#endif /* FUZZ_TARGET */

#define LOG_ERROR(fmt, args...) ALOGE("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args)



#elif defined (ANDROID_EMULATOR)

#elif defined (ANDROID_EMULATOR)  /* end of defined(__ANDROID__) */

// Log using android emulator logging mechanism

#include "android/utils/debug.h"
@@ -86,7 +97,7 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); 
    fprintf(stderr, "%s:%d - %s: " fmt "\n", __FILE__, __LINE__, __func__, ##args); \

    abort();                                                                        \

  } while (false)

#elif defined(TARGET_FLOSS)

#elif defined(TARGET_FLOSS) /* end of defined (ANDROID_EMULATOR) */

#include "gd/common/init_flags.h"

#include "gd/os/syslog.h"
@@ -94,12 +105,6 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); 
#define LOGWRAPPER(tag, fmt, args...) \

  write_syslog(tag, "%s:%s:%d - %s: " fmt, LOG_TAG, __FILE__, __LINE__, __func__, ##args)



#ifdef FUZZ_TARGET

#define LOG_VERBOSE(...)

#define LOG_DEBUG(...)

#define LOG_INFO(...)

#define LOG_WARN(...)

#else

#define LOG_VERBOSE(...)                                                               \

  do {                                                                                 \

    if (bluetooth::common::InitFlags::GetLogLevelForTag(LOG_TAG) >= LOG_TAG_VERBOSE) { \
@@ -114,7 +119,6 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); 
  } while (false)

#define LOG_INFO(...) LOGWRAPPER(LOG_TAG_INFO, __VA_ARGS__)

#define LOG_WARN(...) LOGWRAPPER(LOG_TAG_WARN, __VA_ARGS__)

#endif /*FUZZ_TARGET*/

#define LOG_ERROR(...) LOGWRAPPER(LOG_TAG_ERROR, __VA_ARGS__)



#define LOG_ALWAYS_FATAL(...)               \
@@ -123,7 +127,8 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); 
    abort();                                \

  } while (false)



#else

#else  /* end of defined (TARGET_FLOSS) */



/* syslog didn't work well here since we would be redefining LOG_DEBUG. */

#include <sys/syscall.h>

#include <sys/types.h>
@@ -157,12 +162,6 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); 
        ##args);                                                                                                    \

  } while (false)



#ifdef FUZZ_TARGET

#define LOG_VERBOSE(...)

#define LOG_DEBUG(...)

#define LOG_INFO(...)

#define LOG_WARN(...)

#else

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

  do {                                                                                 \

    if (bluetooth::common::InitFlags::GetLogLevelForTag(LOG_TAG) >= LOG_TAG_VERBOSE) { \
@@ -177,7 +176,6 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); 
  } while (false)

#define LOG_INFO(...) LOGWRAPPER(__VA_ARGS__)

#define LOG_WARN(...) LOGWRAPPER(__VA_ARGS__)

#endif /* FUZZ_TARGET */

#define LOG_ERROR(...) LOGWRAPPER(__VA_ARGS__)



#ifndef LOG_ALWAYS_FATAL
@@ -190,6 +188,8 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); 


#endif /* defined(__ANDROID__) */



#endif /* defined(FUZZ_TARGET) */



#define ASSERT(condition)                                    \

  do {                                                       \

    if (!(condition)) {                                      \
@@ -209,3 +209,4 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); 
  case code:                   \

    return #code

#endif