| commit | 7c6721fd149360662b0758b07780373a6d6ba790 | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Tue Jul 21 17:04:52 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 21 17:05:05 2015 +0000 |
| tree | 530b6f72e03c70666c4651eb5fb86eea12a16f1c | |
| parent | d79f37a9402cef459d6f1c0a29a60fd6613d6ff0 [diff] | |
| parent | b3b6348921a1e96a5d6e0d4894842006a71c0963 [diff] |
Merge "Revert "Clean call-jack and its callers""
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index c59cd34..3941edf 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk
@@ -70,6 +70,7 @@ else ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) my_static_libraries += libunwind_llvm + my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a endif ifeq ($(my_link_type),static)