Merge "Fix build for x86_64"
diff --git a/Android.mk b/Android.mk
index 9109c96..89178df 100644
--- a/Android.mk
+++ b/Android.mk
@@ -117,7 +117,6 @@
LOCAL_C_INCLUDES += $(LOCAL_PATH)/host-$(HOST_OS)-fixup
LOCAL_MODULE := libperf
-LOCAL_MODULE_TAGS := eng
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -154,7 +153,6 @@
LOCAL_C_INCLUDES := external/elfutils external/elfutils/libelf external/elfutils/libdw external/elfutils/libdwfl
LOCAL_MODULE := libperf
-LOCAL_MODULE_TAGS := eng
include $(BUILD_STATIC_LIBRARY)
@@ -165,7 +163,6 @@
include $(CLEAR_VARS)
LOCAL_MODULE := perfhost
-LOCAL_MODULE_TAGS := eng
perf_src_files := \
builtin-annotate.c \
diff --git a/perf.h b/perf.h
index cbc2f5c..1a0a8de 100644
--- a/perf.h
+++ b/perf.h
@@ -92,7 +92,13 @@
#endif
#ifdef __mips__
+/* ANDROID_CHANGE_BEGIN */
+#if 0
#include "../../arch/mips/include/asm/unistd.h"
+#elif !defined(__APPLE__)
+#include <asm/unistd.h>
+#endif
+/* ANDROID_CHANGE_END */
#define rmb() asm volatile( \
".set mips2\n\t" \
"sync\n\t" \
diff --git a/util/symbol.c b/util/symbol.c
index eb31fa0..efb446c 100644
--- a/util/symbol.c
+++ b/util/symbol.c
@@ -2258,7 +2258,7 @@
{
const char *filename;
char path[PATH_MAX];
- struct process_args args = {0};
+ struct process_args args = {0LL};
if (machine__is_host(machine)) {
filename = "/proc/kallsyms";
