diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-14 23:56:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-14 23:56:11 +0000 |
| commit | cbdd2c348f875739be778178087f60a01040b50e (patch) | |
| tree | 393f3d441e6c9cc78fc9a7e6b92b6843c58a3421 /core | |
| parent | c2ac7201a728fe0170900e02833399e80810802e (diff) | |
| parent | 1fa6d5b0a3fc873bce4d16056c115bf30e62a147 (diff) | |
| download | build-cbdd2c348f875739be778178087f60a01040b50e.zip build-cbdd2c348f875739be778178087f60a01040b50e.tar.gz build-cbdd2c348f875739be778178087f60a01040b50e.tar.bz2 | |
am 1fa6d5b0: am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."
* commit '1fa6d5b0a3fc873bce4d16056c115bf30e62a147':
Don't use libunwindbacktrace for non-ARM.
Diffstat (limited to 'core')
| -rw-r--r-- | core/cxx_stl_setup.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index 7961801..da84bdd 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk @@ -68,8 +68,6 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) else ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) my_static_libraries += libunwind_llvm - else - my_static_libraries += libunwindbacktrace endif ifeq ($(my_link_type),static) |