|
From: <sv...@va...> - 2011-10-27 10:57:10
|
Author: sewardj Date: 2011-10-27 11:52:27 +0100 (Thu, 27 Oct 2011) New Revision: 12241 Log: Merge from trunk, r12233 (Disable the GDB server-by-default for the time being on Android) Modified: branches/VALGRIND_3_7_BRANCH/coregrind/m_options.c Modified: branches/VALGRIND_3_7_BRANCH/coregrind/m_options.c =================================================================== --- branches/VALGRIND_3_7_BRANCH/coregrind/m_options.c 2011-10-27 10:51:08 UTC (rev 12240) +++ branches/VALGRIND_3_7_BRANCH/coregrind/m_options.c 2011-10-27 10:52:27 UTC (rev 12241) @@ -47,7 +47,11 @@ 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; |