From be4348e7c73841766208f4eb771dde1455b26449 Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
Date: Thu, 14 Aug 2014 15:46:36 -0700
Subject: [PATCH] Keep symbols for linker

Bug: 17011146

(cherry picked from commit ad5e8b50737144833233d47fe04deb3fa0284df2)

Change-Id: Ib1d3f8d6d38af98586658e01ed1ec79d2c5b4d42
---
 linker/Android.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/linker/Android.mk b/linker/Android.mk
index 68e801da2..5853c9070 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -57,6 +57,10 @@ LOCAL_MODULE_STEM_32 := linker
 LOCAL_MODULE_STEM_64 := linker64
 LOCAL_MULTILIB := both
 
+# Leave the symbols in the shared library so that stack unwinders can produce
+# meaningful name resolution.
+LOCAL_STRIP_MODULE := keep_symbols
+
 include $(LOCAL_PATH)/linker_executable.mk
 ifdef TARGET_2ND_ARCH
 LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)