From 9eb02c973fc088cf61ab7fb7d9f9782b46239cb2 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@google.com>
Date: Tue, 9 Aug 2016 14:04:05 -0400
Subject: [PATCH] Define TARGET_IS_64_BIT when building libdebuggerd_client for
 android64.

This is needed to connect to the right debuggerd server for the crashing
process. Without this change, the following errors are observed, because a
32-bit process is trying to connect to the 64-bit debuggerd (as opposed to
debuggerd32):

  Fatal signal 11 (SIGSEGV), code 1, fault addr 0x0 in tid 14153 (static_crasher)
  debuggerd: handling request: pid=14153 uid=0 gid=0 tid=14153
  debuggerd: Not allowed to redirect action 0 to 32 bit debuggerd

Bug: 24414818
Change-Id: I2f275fbc804b0abc6e876a743e51dd8494817103
---
 debuggerd/Android.bp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index 8a63f3f12..f0131b81a 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -9,6 +9,12 @@ cc_library_static {
     "-Os",
   ],
 
+  target: {
+    android64: {
+      cflags: ["-DTARGET_IS_64_BIT"],
+    },
+  },
+
   local_include_dirs: ["include"],
   export_include_dirs: ["include"],