diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-01 16:54:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 16:54:46 +0000 |
| commit | 4ca0853cbccb49563a4b0e75ab119dace0b381ad (patch) | |
| tree | cf2c5af2e05fa1703e3a8edb67203885d577801d | |
| parent | f5197ef106db0182bf1a80b0d9d076466e2a962e (diff) | |
| parent | 2cfc479c0b2d2872bfc7b1257aa79452ae6331ff (diff) | |
| download | external_libcxx-4ca0853cbccb49563a4b0e75ab119dace0b381ad.tar.gz external_libcxx-4ca0853cbccb49563a4b0e75ab119dace0b381ad.tar.bz2 external_libcxx-4ca0853cbccb49563a4b0e75ab119dace0b381ad.zip | |
am 2cfc479c: Manually link unwinder.
* commit '2cfc479c0b2d2872bfc7b1257aa79452ae6331ff':
Manually link unwinder.
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index d8a5cf892..26bcf6be2 100644 --- a/Android.mk +++ b/Android.mk @@ -72,8 +72,12 @@ LOCAL_CLANG := true LOCAL_WHOLE_STATIC_LIBRARIES := libc++_static LOCAL_SHARED_LIBRARIES := libdl LOCAL_CXX_STL := none - - +LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm +LOCAL_STATIC_LIBRARIES_arm64 := libunwindbacktrace +LOCAL_STATIC_LIBRARIES_mips := libunwindbacktrace +LOCAL_STATIC_LIBRARIES_mips64 := libunwindbacktrace +LOCAL_STATIC_LIBRARIES_x86 := libunwindbacktrace +LOCAL_STATIC_LIBRARIES_x86_64 := libunwindbacktrace include $(BUILD_SHARED_LIBRARY) # host static lib |