diff options
Diffstat (limited to 'libbacktrace/Android.mk')
| -rwxr-xr-x | libbacktrace/Android.mk | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 2e56756..a7305da 100755 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -46,10 +46,6 @@ libbacktrace_shared_libraries_target := \ libcutils \ libgccdemangle \ -# To enable using libunwind on each arch, add it to this list. -libunwind_architectures := arm arm64 mips x86 x86_64 - -ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),$(libunwind_architectures))) libbacktrace_src_files += \ UnwindCurrent.cpp \ UnwindMap.cpp \ @@ -68,24 +64,6 @@ libbacktrace_shared_libraries_host := \ libbacktrace_static_libraries_host := \ libcutils \ -else -libbacktrace_src_files += \ - Corkscrew.cpp \ - -libbacktrace_c_includes := \ - system/core/libcorkscrew \ - -libbacktrace_shared_libraries := \ - libcorkscrew \ - -libbacktrace_shared_libraries_target += \ - libdl \ - -libbacktrace_ldlibs_host := \ - -ldl \ - -endif - module := libbacktrace module_tag := optional build_type := target @@ -118,20 +96,13 @@ backtrace_test_cflags := \ -fno-builtin \ -O0 \ -g \ - -DGTEST_HAS_STD_STRING \ - -ifneq ($(TARGET_ARCH),arm64) -backtrace_test_cflags += -fstack-protector-all -else - $(info TODO: $(LOCAL_PATH)/Android.mk -fstack-protector not yet available for the AArch64 toolchain) - common_cflags += -fno-stack-protector -endif # arm64 backtrace_test_cflags_target := \ - -DGTEST_OS_LINUX_ANDROID \ + -DENABLE_PSS_TESTS \ backtrace_test_src_files := \ backtrace_test.cpp \ + GetPss.cpp \ thread_utils.c \ backtrace_test_ldlibs := \ |