commit 8b75ec1c7b6efa79f358725d0fd7a3932fd273e5
author Mark Salyzyn <salyzyn@google.com> Wed Apr 15 14:45:04 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 15 14:45:05 2015 +0000
tree 0a5a2d301f2a78676624ec2a2de749107a35ac1f
parent ad1961a74736e02ab16d8688ba7f41a687340bdc
parent c506e74dc8dd82198042078cfcb6c57e34b514b1

Merge "disttools: add liblog, libcutils and libselinux shared libraries"

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 69131c3..8eefa76 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -204,7 +204,7 @@
 endif
 
 # Add in libcompiler_rt for all regular device builds
-ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(WITHOUT_LIBCOMPILER_RT))
+ifeq (,$(LOCAL_SDK_VERSION)$(WITHOUT_LIBCOMPILER_RT))
   my_static_libraries += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
 endif
 

core/cxx_stl_setup.mk

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 @@
     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)