diff options
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index fbce74973..e276ce674 100644 --- a/Android.mk +++ b/Android.mk @@ -60,7 +60,7 @@ LOCAL_CLANG := true 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 @@ LOCAL_LDFLAGS += \ -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 |