commit 6e4438f58e57c3a83dc9b274e2059ca8e119bef1
author Calin Juravle <calin@google.com> Thu Jul 02 10:29:00 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 02 10:29:01 2015 +0000
tree d726d07ee02518fff6e7e045b29c2a323becc032
parent 408bec05f3c7e7423c7086ca80f5e43234527ee8
parent 1265e5f626c350fbf332645fbb1d86262d68e891

Merge "Remove additional prefix for unwind symbols"

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