Merge "Switch to new elfutils (0.153)"
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 1fcba56..79045ff 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -52,6 +52,19 @@
$(call add-clean-step, rm -rf $(OUT)/obj/STATIC_LIBRARIES/libperf_intermediates)
$(call add-clean-step, rm -rf $(OUT)/obj/EXECUTABLES/perf_intermediates)
+$(call add-clean-step, rm -rf $(ANDROID_HOST_OUT)/obj/STATIC_LIBRARIES/libperf_intermediates)
+$(call add-clean-step, rm -rf $(ANDROID_HOST_OUT)/obj/STATIC_LIBRARIES/libdw_intermediates)
+$(call add-clean-step, rm -rf $(ANDROID_HOST_OUT)/obj/STATIC_LIBRARIES/libdwfl_intermediates)
+$(call add-clean-step, rm -rf $(ANDROID_HOST_OUT)/obj/STATIC_LIBRARIES/libelf_intermediates)
+$(call add-clean-step, rm -rf $(ANDROID_HOST_OUT)/obj/STATIC_LIBRARIES/libebl_intermediates)
+$(call add-clean-step, rm -rf $(ANDROID_HOST_OUT)/obj/EXECUTABLES/perf_intermediates)
+$(call add-clean-step, rm -rf $(OUT)/obj/STATIC_LIBRARIES/libperf_intermediates)
+$(call add-clean-step, rm -rf $(OUT)/obj/STATIC_LIBRARIES/libdw_intermediates)
+$(call add-clean-step, rm -rf $(OUT)/obj/STATIC_LIBRARIES/libdwfl_intermediates)
+$(call add-clean-step, rm -rf $(OUT)/obj/STATIC_LIBRARIES/libelf_intermediates)
+$(call add-clean-step, rm -rf $(OUT)/obj/STATIC_LIBRARIES/libebl_intermediates)
+$(call add-clean-step, rm -rf $(OUT)/obj/EXECUTABLES/perf_intermediates)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/perf-3.12.0/tools/perf/Android.mk b/perf-3.12.0/tools/perf/Android.mk
index 5e39853..774fd30 100644
--- a/perf-3.12.0/tools/perf/Android.mk
+++ b/perf-3.12.0/tools/perf/Android.mk
@@ -114,8 +114,8 @@
common_perf_headers := $(LOCAL_PATH)/../lib $(LOCAL_PATH)/util/include \
$(LOCAL_PATH)/util $(LOCAL_PATH)/../../include/uapi
-common_elfutil_headers := external/elfutils external/elfutils/libelf \
- external/elfutils/libdw external/elfutils/libdwfl
+common_elfutil_headers := external/elfutils external/elfutils/0.153/libelf \
+ external/elfutils/0.153/libdw external/elfutils/0.153/libdwfl
common_compiler_flags := -Wno-pointer-arith -Wno-attributes -Wno-error \
-Wno-unused-parameter -Wno-error=return-type -std=gnu99
@@ -126,7 +126,7 @@
common_predefined_macros := -DDWARF_SUPPORT -DPYTHON='""' -DBINDIR='""' \
-DETC_PERFCONFIG='""' -DPREFIX='""' -DPERF_EXEC_PATH='""' \
-DPERF_HTML_PATH='""' -DPERF_MAN_PATH='""' -DPERF_INFO_PATH='""' \
- -DPERF_VERSION='"perf.3.12_android"'
+ -DPERF_VERSION='"perf.3.12_android"' -DHAVE_ELF_GETPHDRNUM
include $(CLEAR_VARS)
