ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Resolve ro.debuggable at build time" am: 68e3a6f94a

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

Change-Id: I092368bb08a3e820c054b6c2dadbd927ffb997ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alessandra Loro 2022-09-01 15:36:39 +00:00 • committed by Automerger Merge Worker
commit b3d6c246f5
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debuggerd/Android.bp
View file

@ -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 {

7
debuggerd/include/debuggerd/handler.h
View file

@ -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);