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

Commit 5e0b5251 authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

Merge "Add two new crash commands." am: 707deba6 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2063434



Change-Id: Ieea0ab7a33c494bf011999f5cf584b8db63ff79c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cfad863a 707deba6

debuggerd/crasher/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ cc_binary { 
    shared_libs: [

        "libbase",

        "liblog",

    ],

    static_libs: [

        "libseccomp_policy",

    ],

    multilib: {

debuggerd/crasher/crasher.cpp

+10 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#include "debuggerd/handler.h"

#endif



extern "C" void android_set_abort_message(const char* msg);



#if defined(__arm__)

// See https://www.kernel.org/doc/Documentation/arm/kernel_user_helpers.txt for details.

#define __kuser_helper_version (*(int32_t*) 0xffff0ffc)
@@ -182,6 +184,8 @@ static int usage() { 
    fprintf(stderr, "  leak                  leak memory until we get OOM-killed\n");

    fprintf(stderr, "\n");

    fprintf(stderr, "  abort                 call abort()\n");

    fprintf(stderr, "  abort_with_msg        call abort() setting an abort message\n");

    fprintf(stderr, "  abort_with_null_msg   call abort() setting a null abort message\n");

    fprintf(stderr, "  assert                call assert() without a function\n");

    fprintf(stderr, "  assert2               call assert() with a function\n");

    fprintf(stderr, "  exit                  call exit(1)\n");
@@ -259,6 +263,12 @@ noinline int do_action(const char* arg) { 
      return crash(42);

    } else if (!strcasecmp(arg, "abort")) {

      maybe_abort();

    } else if (!strcasecmp(arg, "abort_with_msg")) {

      android_set_abort_message("Aborting due to crasher");

      maybe_abort();

    } else if (!strcasecmp(arg, "abort_with_null")) {

      android_set_abort_message(nullptr);

      maybe_abort();

    } else if (!strcasecmp(arg, "assert")) {

      __assert("some_file.c", 123, "false");

    } else if (!strcasecmp(arg, "assert2")) {