aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-25 16:51:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-25 16:51:56 +0000
commit7ff18da74a4e44b8973951623e6b8439eba0113c (patch)
tree09662308d1bbb53b8872631a0bbc96db0620a395
parent108b44c175dfbfd61938a7bc965f420be86349cc (diff)
parent43541adc067ca6447a6f1c840c3262b9f558fe3c (diff)
downloadlinux-tools-perf-7ff18da74a4e44b8973951623e6b8439eba0113c.tar.gz
am 43541adc: am d51066c5: Merge "Track elfutils 0.161 update."
* commit '43541adc067ca6447a6f1c840c3262b9f558fe3c': Track elfutils 0.161 update.
-rw-r--r--src/tools/perf/Android.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/perf/Android.mk b/src/tools/perf/Android.mk
index 332ade2..a6cc3f4 100644
--- a/src/tools/perf/Android.mk
+++ b/src/tools/perf/Android.mk
@@ -255,7 +255,9 @@ LOCAL_STATIC_LIBRARIES := \
libdwfl \
libdw \
libebl \
+ libdwelf \
libelf \
+ libz \
LOCAL_CFLAGS += $(common_predefined_macros)
LOCAL_CFLAGS += $(common_compiler_flags)
@@ -279,12 +281,14 @@ LOCAL_SRC_FILES_x86_64 := $(perf_src_files_x86)
# TODO: libebl tries to dlopen libebl_$arch.so, which we don't actually build.
# At the moment it's probably pulling in the ones from the host OS' perf, at
-# least on Linux. On the Mac it's probably just completely broken.
+# least on Linux.
LOCAL_STATIC_LIBRARIES := \
libdwfl \
libdw \
libebl \
+ libdwelf \
libelf \
+ libz \
LOCAL_CFLAGS += $(common_predefined_macros) $(host_predefined_macros)
LOCAL_CFLAGS += $(common_compiler_flags)