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

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

Merge changes I648894c4,I0c26d59c 

* changes:
  Ignore logs less than warning on fuzz builds
  Add fuzzing/run script to run fuzz targets easily
parents f5f0df42 e349c050

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/fuzzing/run

0 → 100755
+32 −0
Original line number Diff line number Diff line 
#! /bin/bash



if [[ -z "${ANDROID_BUILD_TOP}" ]]; then

  echo "ANDROID_BUILD_TOP is not set"

fi



if [[ -z "${ANDROID_HOST_OUT}" ]]; then

  echo "ANDROID_HOST_OUT is not set for host run"

fi



HOST=false

POSITIONAL=()

while [[ $# -gt 0 ]]

do

key="$1"

case $key in

    --host)

    HOST=true

    shift # past argument

    ;;

    *)    # unknown option

    POSITIONAL+=("$1") # save it in an array for later

    shift # past argument

    ;;

esac

done

set -- "${POSITIONAL[@]}" # restore positional parameters



if [ "$HOST" == true ] ; then

  HOST_ARCH=$($ANDROID_BUILD_TOP/build/soong/soong_ui.bash --dumpvar-mode HOST_ARCH)

  SANITIZE_HOST=address $ANDROID_BUILD_TOP/build/soong/soong_ui.bash --build-mode --"all-modules" --dir="$(pwd)" $1 && ${ANDROID_HOST_OUT}/fuzz/$HOST_ARCH/$1/$1

fi

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(...) \