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

Commit ab5e5833 authored by Yabin Cui's avatar Yabin Cui
Browse files

Revert "Add BacktraceOffline for offline backtracing." 

Using llvm makes libbacktrace stops building for 32 bit on linux host x86_64.

This reverts commit c9c6b6ee.

Change-Id: Ieb807db881d7bb3132cd09e25fd08c28766ca0a8
parent c9c6b6ee

include/backtrace/Backtrace.h

+0 −14
Original line number Diff line number Diff line
@@ -52,12 +52,6 @@ struct ucontext; 
typedef ucontext ucontext_t;

#endif



struct backtrace_stackinfo_t {

  uint64_t start;

  uint64_t end;

  const uint8_t* data;

};



class Backtrace {

public:

  // Create the correct Backtrace object based on what is to be unwound.
@@ -72,14 +66,6 @@ public: 
  // If map is not NULL, the map is still owned by the caller.

  static Backtrace* Create(pid_t pid, pid_t tid, BacktraceMap* map = NULL);



  // Create an offline Backtrace object that can be used to do an unwind without a process

  // that is still running. If cache_file is set to true, then elf information will be cached

  // for this call. The cached information survives until the calling process ends. This means

  // that subsequent calls to create offline Backtrace objects will continue to use the same

  // cache. It also assumes that the elf files used for each offline unwind are the same.

  static Backtrace* CreateOffline(pid_t pid, pid_t tid, BacktraceMap* map,

                                  const backtrace_stackinfo_t& stack, bool cache_file = false);



  virtual ~Backtrace();



  // Get the current stack trace and store in the backtrace_ structure.

include/backtrace/BacktraceMap.h

+0 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 


#include <deque>

#include <string>

#include <vector>



struct backtrace_map_t {

  uintptr_t start = 0;
@@ -49,8 +48,6 @@ public: 
  // is unsupported.

  static BacktraceMap* Create(pid_t pid, bool uncached = false);



  static BacktraceMap* Create(pid_t pid, const std::vector<backtrace_map_t>& maps);



  virtual ~BacktraceMap();



  // Fill in the map data structure for the given address.

libbacktrace/Android.build.mk

+0 −12
Original line number Diff line number Diff line
@@ -69,14 +69,7 @@ LOCAL_LDLIBS := \ 
    $($(module)_ldlibs) \

    $($(module)_ldlibs_$(build_type)) \



LOCAL_STRIP_MODULE := $($(module)_strip_module)



ifeq ($(build_type),target)

  ifneq (,$(filter $(LOCAL_SHARED_LIBRARIES),libLLVM))

    LLVM_ROOT_PATH := external/llvm

    include $(LLVM_ROOT_PATH)/llvm.mk

    include $(LLVM_DEVICE_BUILD_MK)

  endif

  include $(BUILD_$(build_target))

endif
@@ -84,11 +77,6 @@ ifeq ($(build_type),host) 
  # Only build if host builds are supported.

  ifeq ($(build_host),true)

    LOCAL_CFLAGS += -Wno-extern-c-compat -fno-omit-frame-pointer

    ifneq (,$(filter $(LOCAL_SHARED_LIBRARIES),libLLVM))

      LLVM_ROOT_PATH := external/llvm

      include $(LLVM_ROOT_PATH)/llvm.mk

      include $(LLVM_HOST_BUILD_MK)

    endif

    include $(BUILD_HOST_$(build_target))

  endif

endif

libbacktrace/Android.mk

+0 −10
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ libbacktrace_common_conlyflags := \ 


libbacktrace_common_cppflags := \

	-std=gnu++11 \

	-I external/libunwind/include/tdep \



# The latest clang (r230699) does not allow SP/PC to be declared in inline asm lists.

libbacktrace_common_clang_cflags += \
@@ -45,7 +44,6 @@ libbacktrace_src_files := \ 
	Backtrace.cpp \

	BacktraceCurrent.cpp \

	BacktraceMap.cpp \

	BacktraceOffline.cpp \

	BacktracePtrace.cpp \

	thread_utils.c \

	ThreadEntry.cpp \
@@ -55,7 +53,6 @@ libbacktrace_src_files := \ 


libbacktrace_shared_libraries := \

	libbase \

	libLLVM \

	liblog \

	libunwind \
@@ -89,8 +86,6 @@ libbacktrace_test_cflags := \ 
libbacktrace_test_src_files := \

	backtrace_testlib.c \



libbacktrace_test_strip_module := false



module := libbacktrace_test

module_tag := debug

build_type := target
@@ -112,7 +107,6 @@ backtrace_test_cflags_target := \ 
	-DENABLE_PSS_TESTS \



backtrace_test_src_files := \

	backtrace_offline_test.cpp \

	backtrace_test.cpp \

	GetPss.cpp \

	thread_utils.c \
@@ -126,8 +120,6 @@ backtrace_test_shared_libraries := \ 
	libbacktrace \

	libbase \

	libcutils \

	libLLVM \

	libunwind \



backtrace_test_shared_libraries_target += \

	libdl \
@@ -135,8 +127,6 @@ backtrace_test_shared_libraries_target += \ 
backtrace_test_ldlibs_host += \

	-ldl \



backtrace_test_strip_module := false



module := backtrace_test

module_tag := debug

build_type := target

libbacktrace/Backtrace.cpp

+0 −6
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <cutils/threads.h>



#include "BacktraceLog.h"

#include "BacktraceOffline.h"

#include "thread_utils.h"

#include "UnwindCurrent.h"

#include "UnwindPtrace.h"
@@ -141,8 +140,3 @@ Backtrace* Backtrace::Create(pid_t pid, pid_t tid, BacktraceMap* map) { 
    return new UnwindPtrace(pid, tid, map);

  }

}
 


Backtrace* Backtrace::CreateOffline(pid_t pid, pid_t tid, BacktraceMap* map,

                                    const backtrace_stackinfo_t& stack, bool cache_file) {

  return new BacktraceOffline(pid, tid, map, stack, cache_file);

}