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

Commit c991a776 authored by Alessandra Loro's avatar Alessandra Loro Committed by Automerger Merge Worker
Browse files

Merge "Resolve ro.debuggable at build time" am: 68e3a6f9 am: b3d6c246 am: 8e096b55 

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



Change-Id: I7a32fe225f28e434e7315720256888e29956ae3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 651b849c 8e096b55

debuggerd/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -14,9 +14,15 @@ cc_defaults { 
        "-Wno-nullability-completeness",

        "-Os",

        "-fno-finite-loops",

        "-DANDROID_DEBUGGABLE=0",

    ],



    local_include_dirs: ["include"],

    product_variables: {

        debuggable: {

            cflags: ["-UANDROID_DEBUGGABLE", "-DANDROID_DEBUGGABLE=1"],

        }

    },

}



cc_library_headers {

debuggerd/include/debuggerd/handler.h

+4 −3
Original line number Diff line number Diff line
@@ -62,10 +62,11 @@ void debuggerd_init(debuggerd_callbacks_t* callbacks); 
#define DEBUGGER_SIGNAL BIONIC_SIGNAL_DEBUGGER



static void __attribute__((__unused__)) debuggerd_register_handlers(struct sigaction* action) {

  bool enabled = true;

#if ANDROID_DEBUGGABLE

  char value[PROP_VALUE_MAX] = "";

  bool enabled =

      !(__system_property_get("ro.debuggable", value) > 0 && !strcmp(value, "1") &&

        __system_property_get("debug.debuggerd.disable", value) > 0 && !strcmp(value, "1"));

  enabled = !(__system_property_get("debug.debuggerd.disable", value) > 0 && !strcmp(value, "1"));

#endif

  if (enabled) {

    sigaction(SIGABRT, action, nullptr);

    sigaction(SIGBUS, action, nullptr);