Revert "Convert the rest of libbacktrace to Android.bp"
This reverts commit 9a3603622ff95a602a1ce018ada59cb52d2539f4.
Broke the mips build with an unused parameter warning
Change-Id: If36964ea189b58a9825de8904f1cf49010548b59
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index 684e611..200b6d6 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -22,9 +22,9 @@
"-Werror",
],
- // The latest clang (r230699) does not allow SP/PC to be declared in inline asm lists.
clang_cflags: ["-Wno-inline-asm"],
+ // The latest clang (r230699) does not allow SP/PC to be declared in inline asm lists.
include_dirs: ["external/libunwind/include/tdep"],
// TODO: LLVM_DEVICE_BUILD_MK
@@ -130,95 +130,4 @@
],
},
}
-}
-
-//-------------------------------------------------------------------------
-// The libbacktrace_offline static library.
-//-------------------------------------------------------------------------
-cc_library_static {
- name: "libbacktrace_offline",
- defaults: ["libbacktrace_common"],
- host_supported: true,
- srcs: ["BacktraceOffline.cpp"],
-
- cflags: [
- "-D__STDC_CONSTANT_MACROS",
- "-D__STDC_LIMIT_MACROS",
- "-D__STDC_FORMAT_MACROS",
- ],
-
- header_libs: ["llvm-headers"],
-
- // Use shared libraries so their headers get included during build.
- shared_libs = [
- "libbase",
- "libunwind",
- ],
-}
-
-//-------------------------------------------------------------------------
-// The backtrace_test executable.
-//-------------------------------------------------------------------------
-cc_test {
- name: "backtrace_test",
- defaults: ["libbacktrace_common"],
- host_supported: true,
- srcs: [
- "backtrace_offline_test.cpp",
- "backtrace_test.cpp",
- "GetPss.cpp",
- "thread_utils.c",
- ],
-
- cflags: [
- "-fno-builtin",
- "-O0",
- "-g",
- ],
-
- shared_libs: [
- "libbacktrace_test",
- "libbacktrace",
- "libbase",
- "libcutils",
- "liblog",
- "libunwind",
- ],
-
- group_static_libs: true,
-
- // Statically link LLVMlibraries to remove dependency on llvm shared library.
- static_libs = [
- "libbacktrace_offline",
- "libLLVMObject",
- "libLLVMBitReader",
- "libLLVMMC",
- "libLLVMMCParser",
- "libLLVMCore",
- "libLLVMSupport",
-
- "libziparchive",
- "libz",
- ],
-
- header_libs: ["llvm-headers"],
-
- target: {
- android: {
- cflags: ["-DENABLE_PSS_TESTS"],
- shared_libs: [
- "libdl",
- "libutils",
- ],
- },
- linux: {
- host_ldlibs: [
- "-lpthread",
- "-lrt",
- "-ldl",
- "-lncurses",
- ],
- static_libs: ["libutils"],
- },
- },
-}
+}
\ No newline at end of file