commit 1265e5f626c350fbf332645fbb1d86262d68e891
author Calin Juravle <calin@google.com> Mon Jun 08 14:26:18 2015 +0100
committer Calin Juravle <calin@google.com> Thu Jun 25 12:01:30 2015 +0100
tree cac0eeb4a25befca8a3d39f64d3fe3f8f39b88c9
parent a7db682f20dedc53c6ded05d870eb2490d257fe1

Remove additional prefix for unwind symbols

... when building the static library.

Change-Id: Ibc8892a0b350f351ec4656d4d505bee6dc7f9258

Android.mk

diff --git a/Android.mk b/Android.mk
index 0b94b48..d2e5c06 100644
--- a/Android.mk
+++ b/Android.mk
@@ -253,8 +253,6 @@
 libunwind_build_type := host
 include $(LOCAL_PATH)/Android.build.mk
 libunwind_build_type := target
-# Make sure the static library functions do not interfere with shared version.
-libunwind_cflags += -DUNW_ADDITIONAL_PREFIX
 libunwind_build_target := STATIC_LIBRARY
 include $(LOCAL_PATH)/Android.build.mk
 libunwind_build_type := host
@@ -285,8 +283,7 @@
 
 libunwindbacktrace_cflags += \
     -Wno-old-style-declaration \
-    -fvisibility=hidden \
-    -DUNW_ADDITIONAL_PREFIX \
+    -fvisibility=hidden
 
 libunwind_module := libunwindbacktrace
 libunwind_module_tag := optional