Skip to content
Snippets Groups Projects
Commit 578bc039 authored by Yabin Cui's avatar Yabin Cui
Browse files

libbacktrace: only build libbacktrace_offline static library.

As device may not have libbacktrace_offline shared library, simpleperf
no longer rely on it. So there is no reason to keep libbacktrace_offline
shared library.

Bug: 28152982
Change-Id: If8e31b1434646dbbfed60264eb25f034bc5d6946
(cherry picked from commit 51e60705)
parent f80d64f9
Branches
Tags
No related merge requests found
...@@ -87,7 +87,7 @@ libbacktrace_offline_src_files := \ ...@@ -87,7 +87,7 @@ libbacktrace_offline_src_files := \
BacktraceOffline.cpp \ BacktraceOffline.cpp \
# Use shared llvm library on device to save space. # Use shared llvm library on device to save space.
libbacktrace_offline_shared_libraries := \ libbacktrace_offline_shared_libraries_target := \
libbacktrace \ libbacktrace \
libbase \ libbase \
liblog \ liblog \
...@@ -95,25 +95,20 @@ libbacktrace_offline_shared_libraries := \ ...@@ -95,25 +95,20 @@ libbacktrace_offline_shared_libraries := \
libutils \ libutils \
libLLVM \ libLLVM \
libbacktrace_offline_static_libraries := \ libbacktrace_offline_static_libraries_target := \
libziparchive \ libziparchive \
libz \ libz \
module := libbacktrace_offline # Use static llvm libraries on host to remove dependency on 32-bit llvm shared library
build_type := target # which is not included in the prebuilt.
build_target := SHARED_LIBRARY libbacktrace_offline_static_libraries_host := \
include $(LOCAL_PATH)/Android.build.mk
libbacktrace_offline_shared_libraries := \
libbacktrace \ libbacktrace \
libbase \
liblog \
libunwind \ libunwind \
libziparchive-host \ libziparchive-host \
libz \
# Use static llvm libraries on host to remove dependency on 32-bit llvm shared library libbase \
# which is not included in the prebuilt. liblog \
libbacktrace_offline_static_libraries := \ libutils \
libLLVMObject \ libLLVMObject \
libLLVMBitReader \ libLLVMBitReader \
libLLVMMC \ libLLVMMC \
...@@ -122,8 +117,11 @@ libbacktrace_offline_static_libraries := \ ...@@ -122,8 +117,11 @@ libbacktrace_offline_static_libraries := \
libLLVMSupport \ libLLVMSupport \
module := libbacktrace_offline module := libbacktrace_offline
build_type := target
build_target := STATIC_LIBRARY
libbacktrace_offline_multilib := both
include $(LOCAL_PATH)/Android.build.mk
build_type := host build_type := host
libbacktrace_multilib := both
include $(LOCAL_PATH)/Android.build.mk include $(LOCAL_PATH)/Android.build.mk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -170,13 +168,33 @@ backtrace_test_ldlibs_host := \ ...@@ -170,13 +168,33 @@ backtrace_test_ldlibs_host := \
backtrace_test_shared_libraries := \ backtrace_test_shared_libraries := \
libbacktrace_test \ libbacktrace_test \
libbacktrace \ libbacktrace \
libbacktrace_offline \
libbase \ libbase \
libcutils \ libcutils \
liblog \
libunwind \ libunwind \
backtrace_test_shared_libraries_target += \ backtrace_test_shared_libraries_target += \
libdl \ libdl \
libutils \
libLLVM \
backtrace_test_static_libraries := \
libbacktrace_offline \
backtrace_test_static_libraries_target := \
libziparchive \
libz \
backtrace_test_static_libraries_host := \
libziparchive-host \
libz \
libutils \
libLLVMObject \
libLLVMBitReader \
libLLVMMC \
libLLVMMCParser \
libLLVMCore \
libLLVMSupport \
backtrace_test_ldlibs_host += \ backtrace_test_ldlibs_host += \
-ldl \ -ldl \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment