diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2016-11-28 15:27:40 -0800 |
|---|---|---|
| committer | Pirama Arumuga Nainar <pirama@google.com> | 2016-11-30 17:43:20 +0000 |
| commit | c198b150d473199e933fe24ebcf252c1584219d1 (patch) | |
| tree | 4c12aa20b4643632f8f47e5d25881b706dce6715 /libbacktrace | |
| parent | 16017b3fbbb6ada5cd22ca38e80776981800e036 (diff) | |
| download | system_core-c198b150d473199e933fe24ebcf252c1584219d1.tar.gz system_core-c198b150d473199e933fe24ebcf252c1584219d1.tar.bz2 system_core-c198b150d473199e933fe24ebcf252c1584219d1.zip | |
Statically link LLVM libraries into backtrace_test
Bug: http://b/28866258
Remove dependency of backtrace_test on libLLVM. Also clean up
specification for libbacktrace_offline module. Since it is a static
library now, dependencies are only needed to automatically include
necessary headers.
Test: 32-bit and 64-bit backtrace_test passes on host and on Angler.
mma in system/extras/simpleperf, cts/tests/tests/simpleperf
m test-art-host
Change-Id: I76b0db14d067fa7b140a99edd237370ac04fe873
Diffstat (limited to 'libbacktrace')
| -rw-r--r-- | libbacktrace/Android.mk | 45 |
1 files changed, 10 insertions, 35 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index bb1732587..0f0187293 100644 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -38,40 +38,15 @@ LLVM_ROOT_PATH := external/llvm include $(LLVM_ROOT_PATH)/llvm.mk #------------------------------------------------------------------------- -# The libbacktrace_offline shared library. +# The libbacktrace_offline static library. #------------------------------------------------------------------------- libbacktrace_offline_src_files := \ BacktraceOffline.cpp \ -# Use shared llvm library on device to save space. -libbacktrace_offline_shared_libraries_target := \ - libbacktrace \ +# Use shared libraries so their headers get included during build. +libbacktrace_offline_shared_libraries := \ libbase \ - liblog \ - libunwind \ - libutils \ - libLLVM \ - -libbacktrace_offline_static_libraries_target := \ - libziparchive \ - libz \ - -# Use static llvm libraries on host to remove dependency on 32-bit llvm shared library -# which is not included in the prebuilt. -libbacktrace_offline_static_libraries_host := \ - libbacktrace \ libunwind \ - libziparchive \ - libz \ - libbase \ - liblog \ - libutils \ - libLLVMObject \ - libLLVMBitReader \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMCore \ - libLLVMSupport \ module := libbacktrace_offline build_type := target @@ -113,10 +88,16 @@ backtrace_test_shared_libraries := \ backtrace_test_shared_libraries_target += \ libdl \ libutils \ - libLLVM \ +# Statically link LLVMlibraries to remove dependency on llvm shared library. backtrace_test_static_libraries := \ libbacktrace_offline \ + libLLVMObject \ + libLLVMBitReader \ + libLLVMMC \ + libLLVMMCParser \ + libLLVMCore \ + libLLVMSupport \ backtrace_test_static_libraries_target := \ libziparchive \ @@ -126,12 +107,6 @@ backtrace_test_static_libraries_host := \ libziparchive \ libz \ libutils \ - libLLVMObject \ - libLLVMBitReader \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMCore \ - libLLVMSupport \ backtrace_test_ldlibs_host += \ -ldl \ |