diff options
| -rw-r--r-- | tools/perf/Makefile | 4 | ||||
| -rw-r--r-- | tools/perf/util/event.c | 1 | ||||
| -rw-r--r-- | tools/perf/util/event.h | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 267ffb1a71aa..5a797c681aac 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -474,7 +474,7 @@ ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF)),y) ifeq ($(call try-cc,$(SOURCE_BIONIC),$(FLAGS_GLIBC)),y) # Found Bionic instead of glibc... # That works too, but needs a bit of special treatment - BASIC_CFLAGS += -DANDROID -include compat-android.h + BASIC_CFLAGS += -DANDROID -DHAVE_STRLCPY -include $(CURDIR)/compat-android.h ANDROID := 1 else msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static); @@ -931,7 +931,7 @@ $(LIB_FILE): $(LIB_OBJS) # libtraceevent.a $(LIBTRACEEVENT): - $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) libtraceevent.a + $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) VERBOSE=2 CFLAGS="$(ALL_CFLAGS)" O=$(OUTPUT) libtraceevent.a $(LIBTRACEEVENT)-clean: $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) clean diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 1b33d0168996..6715b1938725 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -6,7 +6,6 @@ #include "strlist.h" #include "thread.h" #include "thread_map.h" -#include "../compat-android.h" static const char *perf_event__names[] = { [0] = "TOTAL", diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index 892d0340278b..21b99e741a87 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -6,7 +6,6 @@ #include "../perf.h" #include "map.h" -#include "../compat-android.h" /* * PERF_SAMPLE_IP | PERF_SAMPLE_TID | * |