resolved conflicts for merge of 93a44a28 to jb-dev-plus-aosp

Change-Id: I9c1f2e37602bea86e70333d2b274665e99fcbd92

1 files changed, 15 insertions, 5 deletions

diff --git a/vm/Thread.cpp b/vm/Thread.cpp
index d82f15afe..aa2352af2 100644
--- a/vm/Thread.cpp
+++ b/vm/Thread.cpp
@@ -3540,15 +3540,25 @@ void dvmNukeThread(Thread* thread)
      * The target thread can continue to execute between the two signals.
      * (The first just causes debuggerd to attach to it.)
      */
-    ALOGD("threadid=%d: sending two SIGSTKFLTs to threadid=%d (tid=%d) to"
-         " cause debuggerd dump",
-        dvmThreadSelf()->threadId, thread->threadId, thread->systemTid);
-    killResult = pthread_kill(thread->handle, SIGSTKFLT);
+#ifdef SIGSTKFLT
+#define SIG SIGSTKFLT
+#define SIGNAME "SIGSTKFLT"
+#elif defined(SIGEMT)
+#define SIG SIGEMT
+#define SIGNAME "SIGEMT"
+#else
+#error No signal available for dvmNukeThread
+#endif
+
+    ALOGD("threadid=%d: sending two " SIGNAME "s to threadid=%d (tid=%d) to"
+          " cause debuggerd dump",
+          dvmThreadSelf()->threadId, thread->threadId, thread->systemTid);
+    killResult = pthread_kill(thread->handle, SIG);
     if (killResult != 0) {
         ALOGD("NOTE: pthread_kill #1 failed: %s", strerror(killResult));
     }
     usleep(2 * 1000 * 1000);    // TODO: timed-wait until debuggerd attaches
-    killResult = pthread_kill(thread->handle, SIGSTKFLT);
+    killResult = pthread_kill(thread->handle, SIG);
     if (killResult != 0) {
         ALOGD("NOTE: pthread_kill #2 failed: %s", strerror(killResult));
     }