diff options
| author | Colin Cross <ccross@android.com> | 2022-03-30 00:29:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-30 00:29:39 +0000 |
| commit | f8c69c1eb75ac4719e0309c6037e33fbd2a7b443 (patch) | |
| tree | a2cee4af0ea8a5ec0f987611a54ae3c5545deabc | |
| parent | 8a4c79961788ad635e17e33710a0254150bc244c (diff) | |
| parent | eebd95b54dbba87edc53c46ad42546de89315200 (diff) | |
| download | extras-f8c69c1eb75ac4719e0309c6037e33fbd2a7b443.tar.gz | |
Merge changes Idcff0bf3,Ic5b4713e am: eebd95b54d
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2048207
Change-Id: I0d40a4fb390f1541280118f00b5f0fa6fee1e0b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | ioshark/compile_ioshark.c | 2 | ||||
| -rw-r--r-- | ioshark/compile_ioshark_subr.c | 2 | ||||
| -rw-r--r-- | ioshark/convert_format.c | 2 | ||||
| -rw-r--r-- | ioshark/dump_ioshark_filenames.c | 2 | ||||
| -rw-r--r-- | ioshark/ioshark_bench.c | 2 | ||||
| -rw-r--r-- | ioshark/ioshark_bench_mmap.c | 2 | ||||
| -rw-r--r-- | simpleperf/IOEventLoop.h | 1 | ||||
| -rw-r--r-- | simpleperf/environment.h | 3 |
8 files changed, 9 insertions, 7 deletions
diff --git a/ioshark/compile_ioshark.c b/ioshark/compile_ioshark.c index 13755299..fe9085cf 100644 --- a/ioshark/compile_ioshark.c +++ b/ioshark/compile_ioshark.c @@ -22,7 +22,7 @@ #include <signal.h> #include <string.h> #include <sys/stat.h> -#include <sys/errno.h> +#include <errno.h> #include <fcntl.h> #include <ctype.h> #include "ioshark.h" diff --git a/ioshark/compile_ioshark_subr.c b/ioshark/compile_ioshark_subr.c index 43fb2544..6fc301cc 100644 --- a/ioshark/compile_ioshark_subr.c +++ b/ioshark/compile_ioshark_subr.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> #include <sys/stat.h> -#include <sys/errno.h> +#include <errno.h> #include "ioshark.h" #include "compile_ioshark.h" #include <endian.h> diff --git a/ioshark/convert_format.c b/ioshark/convert_format.c index 3436ca77..989bfcb8 100644 --- a/ioshark/convert_format.c +++ b/ioshark/convert_format.c @@ -22,7 +22,7 @@ #include <signal.h> #include <string.h> #include <sys/stat.h> -#include <sys/errno.h> +#include <errno.h> #include <fcntl.h> #include <ctype.h> #include <endian.h> diff --git a/ioshark/dump_ioshark_filenames.c b/ioshark/dump_ioshark_filenames.c index c082c274..a28ab790 100644 --- a/ioshark/dump_ioshark_filenames.c +++ b/ioshark/dump_ioshark_filenames.c @@ -21,7 +21,7 @@ #include <signal.h> #include <string.h> #include <sys/stat.h> -#include <sys/errno.h> +#include <errno.h> #include <fcntl.h> #include <ctype.h> #include "ioshark.h" diff --git a/ioshark/ioshark_bench.c b/ioshark/ioshark_bench.c index e44a2a53..9540b741 100644 --- a/ioshark/ioshark_bench.c +++ b/ioshark/ioshark_bench.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <string.h> #include <sys/stat.h> -#include <sys/errno.h> +#include <errno.h> #include <fcntl.h> #include <string.h> #include <assert.h> diff --git a/ioshark/ioshark_bench_mmap.c b/ioshark/ioshark_bench_mmap.c index e8b3acce..3b37fbf6 100644 --- a/ioshark/ioshark_bench_mmap.c +++ b/ioshark/ioshark_bench_mmap.c @@ -23,7 +23,7 @@ #include <string.h> #include <pthread.h> #include <sys/stat.h> -#include <sys/errno.h> +#include <errno.h> #include <fcntl.h> #include <string.h> #include <assert.h> diff --git a/simpleperf/IOEventLoop.h b/simpleperf/IOEventLoop.h index f0192969..0bbbbd01 100644 --- a/simpleperf/IOEventLoop.h +++ b/simpleperf/IOEventLoop.h @@ -18,6 +18,7 @@ #define SIMPLE_PERF_IOEVENT_LOOP_H_ #include <stdint.h> +#include <sys/time.h> #include <time.h> #include <functional> diff --git a/simpleperf/environment.h b/simpleperf/environment.h index 1dd6952e..34ce7fa5 100644 --- a/simpleperf/environment.h +++ b/simpleperf/environment.h @@ -144,7 +144,8 @@ static inline uint64_t GetSystemClock() { #if defined(__ANDROID__) bool IsInAppUid(); -#else +#endif +#if !defined(__ANDROID__) && !defined(ANDROID_HOST_MUSL) static inline int gettid() { return syscall(__NR_gettid); } |