From 7c27cc24e7172183f2057fda4e38643f60228b99 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Wed, 28 Nov 2018 00:46:00 +0000 Subject: Use libdexfile external API in simpleperf. Test: device boot Test: atest system/extras/simpleperf/ (lots of failures, but no new ones. 4 of 4 passed in simpleperf_unit_test) Test: mmma system/extras/simpleperf && adb root && adb shell rm -rf /data/test && adb push out/target/product/taimen/testcases/simpleperf_unit_test /data/test && adb shell /data/test/arm64/simpleperf_unit_test && adb shell /data/test/arm/simpleperf_unit_test Bug: 119632407 Change-Id: Id070b8a99cb4d3bf4ec90cae186a2e88bcec72a1 --- simpleperf/Android.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'simpleperf/Android.mk') diff --git a/simpleperf/Android.mk b/simpleperf/Android.mk index 4b82136c..8afb4d48 100644 --- a/simpleperf/Android.mk +++ b/simpleperf/Android.mk @@ -26,8 +26,8 @@ simpleperf_cflags_host := $(simpleperf_common_cflags) \ -DUSE_BIONIC_UAPI_HEADERS -I bionic/libc/kernel \ -fvisibility=hidden \ -simpleperf_cflags_host_darwin := -I $(LOCAL_PATH)/nonlinux_support/include -simpleperf_cflags_host_windows := -I $(LOCAL_PATH)/nonlinux_support/include +simpleperf_cflags_host_darwin := -I $(LOCAL_PATH)/nonlinux_support/include -DNO_LIBDEXFILE_SUPPORT +simpleperf_cflags_host_windows := -I $(LOCAL_PATH)/nonlinux_support/include -DNO_LIBDEXFILE_SUPPORT LLVM_ROOT_PATH := external/llvm @@ -36,6 +36,8 @@ include $(LLVM_ROOT_PATH)/llvm.mk simpleperf_static_libraries_target := \ libbacktrace \ libunwindstack \ + libdexfile_support \ + libdexfile_external \ libdexfile \ libziparchive \ libz \ @@ -77,6 +79,8 @@ simpleperf_static_libraries_host_linux := \ libprocinfo \ libbacktrace \ libunwindstack \ + libdexfile_support \ + libdexfile_external \ libdexfile \ libcutils \ libevent \ -- cgit v1.2.3