Merge from trunk, r12233 (Disable the GDB server-by-default for the

time being on Android)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_7_BRANCH@12241

diff --git a/coregrind/m_options.c b/coregrind/m_options.c
index 59cc4b752e97b436b2b06e588bcbde537d1468c9..9b89fe9ff8d5eba094ebfca0a250bbc9a66ed520 100644 (file)
--- a/coregrind/m_options.c
+++ b/coregrind/m_options.c
@@ -47,7 +47,11 @@ VexControl VG_(clo_vex_control);
 Bool   VG_(clo_error_limit)    = True;
 Int    VG_(clo_error_exitcode) = 0;
 
+#if defined(VGPV_arm_linux_android)
+VgVgdb VG_(clo_vgdb)           = Vg_VgdbNo; // currently disabled on Android
+#else
 VgVgdb VG_(clo_vgdb)           = Vg_VgdbYes;
+#endif
 Int    VG_(clo_vgdb_poll)      = 5000; 
 Int    VG_(clo_vgdb_error)     = 999999999;
 HChar* VG_(clo_vgdb_prefix)    = NULL;