Work around for duplicate symbols in static libs

Bug: 15110069
Change-Id: I24757ad60d94ac250065e2680871d0059e8c240d

3 files changed, 20 insertions, 2 deletions

diff --git a/Android.mk b/Android.mk
index 6f94bb1f..a01535f5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -114,7 +114,7 @@ libunwind_src_files := \
 	src/dwarf/Lfde.c \
 	src/dwarf/Lparser.c \
 	src/dwarf/Lpe.c \
-	src/dwarf/Lstep.c \
+	src/dwarf/Lstep_dwarf.c \
 	src/dwarf/Lfind_proc_info-lsb.c \
 	src/dwarf/Lfind_unwind_table.c \
 	src/dwarf/Gexpr.c \
@@ -123,7 +123,7 @@ libunwind_src_files := \
 	src/dwarf/Gfind_unwind_table.c \
 	src/dwarf/Gparser.c \
 	src/dwarf/Gpe.c \
-	src/dwarf/Gstep.c \
+	src/dwarf/Gstep_dwarf.c \
 	src/dwarf/global.c \
 	src/os-common.c \
 	src/os-linux.c \
diff --git a/src/dwarf/Gstep_dwarf.c b/src/dwarf/Gstep_dwarf.c
new file mode 100644
index 00000000..586d0d5b
--- /dev/null
+++ b/src/dwarf/Gstep_dwarf.c
@@ -0,0 +1,9 @@
+/*
+ * This is a temporary work around for using libunwind.a with
+ * WHOLE_STATIC_LIBRARIES. Since every build will have one Gstep.o for the
+ * target architecture and another for dwarf, libunwind.a was given two copies
+ * of Gstep.o. Our build system is unable to handle this right now.
+ *
+ * Bug: 15110069
+ */
+#include "Gstep.c"
diff --git a/src/dwarf/Lstep_dwarf.c b/src/dwarf/Lstep_dwarf.c
new file mode 100644
index 00000000..96de5de8
--- /dev/null
+++ b/src/dwarf/Lstep_dwarf.c
@@ -0,0 +1,9 @@
+/*
+ * This is a temporary work around for using libunwind.a with
+ * WHOLE_STATIC_LIBRARIES. Since every build will have one Lstep.o for the
+ * target architecture and another for dwarf, libunwind.a was given two copies
+ * of Lstep.o. Our build system is unable to handle this right now.
+ *
+ * Bug: 15110069
+ */
+#include "Lstep.c"