ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am ca1797ae: Merge "Remove the stlport linked libbacktrace."

Browse source 
* commit 'ca1797ae00d3b5bf2eb4d1cad5bb68cef0074346':
  Remove the stlport linked libbacktrace.
This commit is contained in:
Dan Albert 2014-11-12 22:21:47 +00:00 • committed by Android Git Automerger
commit 9b5b2d2c23
2 changed files with 1 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libbacktrace/Android.build.mk
View file

@ -61,12 +61,6 @@ LOCAL_LDLIBS := \
$($(module)_ldlibs_$(build_type)) \
ifeq ($(build_type),target)
ifneq ($($(module)_libc++),)
include external/libcxx/libcxx.mk
else
include external/stlport/libstlport.mk
endif
include $(BUILD_$(build_target))
endif

66
libbacktrace/Android.mk
View file

@ -70,54 +70,9 @@ build_type := target
build_target := SHARED_LIBRARY
include $(LOCAL_PATH)/Android.build.mk
build_type := host
libbacktrace_multilib := both
include $(LOCAL_PATH)/Android.build.mk
# Don't build for unbundled branches
ifeq (,$(TARGET_BUILD_APPS))
#-------------------------------------------------------------------------
# The libbacktrace library (libc++)
#-------------------------------------------------------------------------
libbacktrace_libc++_src_files := \
BacktraceImpl.cpp \
BacktraceMap.cpp \
BacktraceThread.cpp \
thread_utils.c \
libbacktrace_libc++_shared_libraries_target := \
libcutils \
libgccdemangle \
libbacktrace_libc++_src_files += \
UnwindCurrent.cpp \
UnwindMap.cpp \
UnwindPtrace.cpp \
libbacktrace_libc++_c_includes := \
external/libunwind/include \
libbacktrace_libc++_shared_libraries := \
libunwind \
libunwind-ptrace \
libbacktrace_libc++_shared_libraries_host := \
liblog \
libbacktrace_libc++_static_libraries_host := \
libcutils \
libbacktrace_libc++_libc++ := true
module := libbacktrace_libc++
module_tag := optional
build_type := target
build_target := SHARED_LIBRARY
include $(LOCAL_PATH)/Android.build.mk
build_type := host
libbacktrace_libc++_multilib := both
include $(LOCAL_PATH)/Android.build.mk
libbacktrace_libc++_multilib :=
endif
#-------------------------------------------------------------------------
# The libbacktrace_test library needed by backtrace_test.
#-------------------------------------------------------------------------
@ -188,23 +143,4 @@ LOCAL_SRC_FILES := \
include $(BUILD_HOST_SHARED_LIBRARY)
# Don't build for unbundled branches
ifeq (,$(TARGET_BUILD_APPS))
#-------------------------------------------------------------------------
# The libbacktrace library (libc++)
#-------------------------------------------------------------------------
include $(CLEAR_VARS)
LOCAL_MODULE := libbacktrace_libc++
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := \
BacktraceMap.cpp \
LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY)
endif # TARGET_BUILD_APPS
endif # HOST_OS-darwin