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

Commit e349c050 authored by Zach Johnson's avatar Zach Johnson
Browse files

Ignore logs less than warning on fuzz builds 

It slows down fuzzing and prevents you from seeing fuzzer output.
Not needed, especially during automated fuzzing.

Create variant of libbluetooth_gd with this turned on.

Test: gd/fuzzing/run --host bluetooth_gd_hci_fuzz_test
Change-Id: I648894c41669b3a34d3ed937ede4f5524aff2d00
parent e1ca1f10

system/gd/Android.bp

+23 −3
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ cc_defaults { 
    ],

}



cc_library {

    name: "libbluetooth_gd",

cc_defaults {

    name: "libbluetooth_gd_defaults",

    defaults: [

        "gd_defaults",

        "gd_clang_file_coverage",
@@ -153,6 +153,23 @@ cc_library { 
    ],

}



cc_library {

    name: "libbluetooth_gd",

    defaults: [

      "libbluetooth_gd_defaults",

    ],

}



cc_library {

    name: "libbluetooth_gd_fuzzing",

    defaults: [

      "libbluetooth_gd_defaults",

    ],

    cflags: [

      "-DFUZZ_TARGET",

    ],

}



cc_binary {

    name: "bluetooth_stack_with_facade",

    defaults: [
@@ -297,7 +314,7 @@ cc_defaults { 
    ":BluetoothFuzzingHelperSources",

  ],

  static_libs: [

    "libbluetooth_gd",

    "libbluetooth_gd_fuzzing",

    "libchrome",

    "libgmock",

    "libgtest",
@@ -309,6 +326,9 @@ cc_defaults { 
  shared_libs: [

    "libcrypto",

  ],

  cflags: [

    "-DFUZZ_TARGET",

  ],

  target: {

    android: {

        shared_libs: [

system/gd/os/log.h

+12 −0
Original line number Diff line number Diff line
@@ -32,9 +32,15 @@ 
 * get rid of legacy stack. */

#ifndef LOG_VERBOSE



#ifdef FUZZ_TARGET

#define LOG_VERBOSE(...)

#define LOG_DEBUG(...)

#define LOG_INFO(...)

#else

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

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

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

#endif /* FUZZ_TARGET */

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

#define LOG_ERROR(fmt, args...) ALOGE("%s:%d %s: " fmt, __FILE__, __LINE__, __func__, ##args)
@@ -63,9 +69,15 @@ 
    fprintf(stderr, "%s %s - %s:%d - %s: " fmt "\n", buf, LOG_TAG, __FILE__, __LINE__, __func__, ##args);             \

  } while (false)



#ifdef FUZZ_TARGET

#define LOG_VERBOSE(...)

#define LOG_DEBUG(...)

#define LOG_INFO(...)

#else

#define LOG_VERBOSE(...) LOGWRAPPER(__VA_ARGS__)

#define LOG_DEBUG(...) LOGWRAPPER(__VA_ARGS__)

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

#endif /* FUZZ_TARGET */

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

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

#define LOG_ALWAYS_FATAL(...) \