From 97a20eed5c3cf3a2f7bb261705405b8b16c56b36 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sun, 14 May 2017 18:46:34 -0700
Subject: Disallow duma/ltrace/strace for bionic

Allow cross-gdb and gdbserver. This requires removal of an explicit
check that disables gdbserver on android. However, the comment above
that check refers to exec_elf.h, which has been removed since API level
19. It builds fine with current selection of the sample (21). Only
build-tested, hope someone can give it a try and report back.

We can fine tune the check for GDB but I'll leave it for now.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 config/debug/duma.in       | 1 +
 config/debug/gdb.in.native | 1 +
 config/debug/ltrace.in     | 1 +
 config/debug/strace.in     | 2 ++
 4 files changed, 5 insertions(+)

(limited to 'config/debug')

diff --git a/config/debug/duma.in b/config/debug/duma.in
index 170a6945..f9e727b8 100644
--- a/config/debug/duma.in
+++ b/config/debug/duma.in
@@ -1,6 +1,7 @@
 # D.U.M.A. - Detect Unintended Memory Access - Memory checker
 
 ## depends on ! BARE_METAL
+## depends on ! LIBC_bionic
 
 ## help D.U.M.A. - Detect Unintended Memory Access
 ## help A memory bound checker, with additional features.
diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native
index e856b5da..faee8c3d 100644
--- a/config/debug/gdb.in.native
+++ b/config/debug/gdb.in.native
@@ -4,6 +4,7 @@ config GDB_NATIVE
     bool
     prompt "Native gdb"
     depends on ! BARE_METAL
+    depends on ! LIBC_bionic
     select EXPAT_TARGET
     select NCURSES_TARGET
     help
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index 4c626764..fab6b81f 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -1,6 +1,7 @@
 # ltrace
 
 ## select LIBELF_TARGET
+## depends on ! LIBC_bionic
 ##
 ## help ltrace is a program that simply runs the specified command until it exits.
 ## help It intercepts and records the dynamic library calls which are called by
diff --git a/config/debug/strace.in b/config/debug/strace.in
index 38dd96fd..e77702bf 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -1,5 +1,7 @@
 # strace
 
+## depends on ! LIBC_bionic
+
 choice
     bool
     prompt "strace version"
-- 
cgit v1.2.3