diff options
author | Elliott Hughes <enh@google.com> | 2015-02-25 17:00:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 17:00:16 +0000 |
commit | 38af812dc7be5b81033c931e3e5078215954d521 (patch) | |
tree | 09662308d1bbb53b8872631a0bbc96db0620a395 | |
parent | 79de4c5e0a108bbe54fc815ca709b05d3126183a (diff) | |
parent | 7ff18da74a4e44b8973951623e6b8439eba0113c (diff) | |
download | linux-tools-perf-38af812dc7be5b81033c931e3e5078215954d521.tar.gz |
am 7ff18da7: am 43541adc: am d51066c5: Merge "Track elfutils 0.161 update."
* commit '7ff18da74a4e44b8973951623e6b8439eba0113c':
Track elfutils 0.161 update.
-rw-r--r-- | src/tools/perf/Android.mk | 6 |
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) |