commit a6c24e4f5274c20743b4b52a5a7ae0cdfef81abd
author Yabin Cui <yabinc@google.com> Wed Apr 13 21:29:48 2016 -0700
committer Yabin Cui <yabinc@google.com> Wed Apr 13 21:39:25 2016 -0700
tree 11fef6dd93dbc800111a427d83a0777f36ec1293
parent 0ce7277f8df3a9ca8d00d40c20c78c89bdb3e584

simpleperf_cts_test: use libbacktrace_offline static library.

Device may not be built with libbacktrace_offline shared library,
so use libbacktrace_offline static library instead.

Bug: 28152982
Change-Id: I46fdb53e711dd60902dca7c9d46030c16eeb222a

tests/tests/simpleperf/Android.mk

diff --git a/tests/tests/simpleperf/Android.mk b/tests/tests/simpleperf/Android.mk
index 04e3e2a..563c2b9 100644
--- a/tests/tests/simpleperf/Android.mk
+++ b/tests/tests/simpleperf/Android.mk
@@ -4,6 +4,9 @@
 list_executable := $(test_executable)_list
 simpleperf_src_path := system/extras/simpleperf
 
+LLVM_ROOT_PATH := external/llvm
+include $(LLVM_ROOT_PATH)/llvm.mk
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := $(test_executable)
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest
@@ -13,7 +16,7 @@
 
 LOCAL_SHARED_LIBRARIES += \
   libbacktrace \
-  libbacktrace_offline \
+  libunwind \
   libbase \
   liblog \
   libutils \
@@ -24,9 +27,10 @@
 
 LOCAL_STATIC_LIBRARIES += \
   libgtest \
-  liblzma \
+  libbacktrace_offline \
   libziparchive \
   libz \
+  liblzma \
 
 LOCAL_POST_LINK_CMD =  \
   TMP_FILE=`mktemp $(OUT_DIR)/simpleperf-post-link-XXXXXXXXXX` && \
@@ -44,19 +48,26 @@
 LOCAL_MULTILIB := first
 LOCAL_LDLIBS = -lrt
 
-LOCAL_SHARED_LIBRARIES := \
-  libbacktrace_offline \
-  libbacktrace \
-
 LOCAL_WHOLE_STATIC_LIBRARIES += \
   libsimpleperf_cts_test \
 
 LOCAL_STATIC_LIBRARIES += \
+  libbacktrace_offline \
+  libbacktrace \
+  libunwind \
   libziparchive-host \
+  libz \
+  liblzma \
   libbase \
   liblog \
-  liblzma \
-  libz \
+  libcutils \
   libutils \
+  libLLVMObject \
+  libLLVMBitReader \
+  libLLVMMC \
+  libLLVMMCParser \
+  libLLVMCore \
+  libLLVMSupport \
 
+include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_NATIVE_TEST)