Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f03bd953 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Adds libc++ versions of libbacktrace"

parents 0296be9d 40a46dde

libbacktrace/Android.build.mk

+5 −1
Original line number Diff line number Diff line
@@ -60,7 +60,11 @@ 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

libbacktrace/Android.mk

+41 −0
Original line number Diff line number Diff line
@@ -72,6 +72,47 @@ include $(LOCAL_PATH)/Android.build.mk 
build_type := host

include $(LOCAL_PATH)/Android.build.mk



#-------------------------------------------------------------------------

# 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

include $(LOCAL_PATH)/Android.build.mk



#-------------------------------------------------------------------------

# The libbacktrace_test library needed by backtrace_test.

#-------------------------------------------------------------------------