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

Commit 0d7164d4 authored by Dan Albert's avatar Dan Albert
Browse files

Remove the stlport linked libbacktrace. 

Rename the libc++ linked libbacktrace to the normal name.

Bug: 15193147
Change-Id: I75caf1ee527e3703825e0db757497fb8fa3dd122
parent 2c0839e9

libbacktrace/Android.build.mk

+0 −6
Original line number Diff line number Diff line
@@ -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

libbacktrace/Android.mk

+1 −65
Original line number Diff line number Diff line
@@ -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