commit 9d3a3a789b80722321e4201d02bbd7b5a261aa32
author Dan Albert <danalbert@google.com> Fri May 16 09:27:17 2014 -0700
committer Dan Albert <danalbert@google.com> Thu May 22 14:43:53 2014 -0700
tree 5f91ff279b9ff5623ce37b4cb9391b97fbd72f13
parent 65759667bd45650262d04c71e2987cb33d835eea

Exports symbols from libcxxrt

Change-Id: Ie2f2f660425f54999a78e922461c41262bf83f89

Android.mk

diff --git a/Android.mk b/Android.mk
index fbce749..e276ce6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -60,7 +60,7 @@
 LOCAL_SRC_FILES := $(LIBCXX_SRC_FILES)
 LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS) -Iexternal/libcxxrt/include -DLIBCXXRT
 LOCAL_RTTI_FLAG := -frtti
-LOCAL_STATIC_LIBRARIES := libcxxrt
+LOCAL_WHOLE_STATIC_LIBRARIES := libcxxrt
 LOCAL_SHARED_LIBRARIES := libdl
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc
 
@@ -97,9 +97,8 @@
             -Wl,-force_symbols_weak_list,external/libcxx/lib/weak.exp
 LOCAL_STATIC_LIBRARIES := libc++abi
 else
-LOCAL_CPPFLAGS += -Iexternal/libcxxrt/include -DLIBCXXRT
-LOCAL_STATIC_LIBRARIES := libcxxrt libunwind
-LOCAL_WHOLE_STATIC_LIBRARIES := libcompiler_rt
+LOCAL_CPPFLAGS += -Iexternal/libcxxrt/src -DLIBCXXRT
+LOCAL_WHOLE_STATIC_LIBRARIES := libcompiler_rt libcxxrt
 LOCAL_LDLIBS += -lrt -lpthread -ldl -lm
 endif