Merge "ANDROID: tracecmd: Fix temp file paths" am: 21202940d0 am: 0362a4a2fa am: ff64d3e1a8

Original change: https://android-review.googlesource.com/c/platform/external/trace-cmd/+/2313384

Change-Id: I12e45a597c64aa623623e939ba1983f4bbaac07a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

lib/trace-cmd/include/private/trace-cmd-private.h

diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h
index 766e0a7..3cc3e9d 100644
--- a/lib/trace-cmd/include/private/trace-cmd-private.h
+++ b/lib/trace-cmd/include/private/trace-cmd-private.h
@@ -381,7 +381,12 @@
 };
 
 /* for both client and server */
+#ifdef __ANDROID__
+#define MSG_CACHE_FILE "/data/local/tmp/trace_msg_cacheXXXXXX"
+#else	/* !__ANDROID__ */
 #define MSG_CACHE_FILE "/tmp/trace_msg_cacheXXXXXX"
+#endif	/* __ANDROID__ */
+
 struct tracecmd_msg_handle {
 	int			fd;
 	short			cpu_count;

lib/trace-cmd/trace-input.c

diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 442b1c5..8ffdf04 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -67,14 +67,24 @@
 struct cpu_zdata {
 	/* uncompressed cpu data */
 	int			fd;
+#ifdef __ANDROID__
+	char			file[37]; /* strlen(COMPR_TEMP_FILE) */
+#else	/* !__ANDROID__ */
 	char			file[26]; /* strlen(COMPR_TEMP_FILE) */
+#endif	/* __ANDROID__ */
+
 	unsigned int		count;
 	unsigned int		last_chunk;
 	struct list_head	cache;
 	struct tracecmd_compress_chunk	*chunks;
 };
 
+#ifdef __ANDROID__
+#define COMPR_TEMP_FILE "/data/local/tmp/trace_cpu_dataXXXXXX"
+#else	/* !__ANDROID__ */
 #define COMPR_TEMP_FILE "/tmp/trace_cpu_dataXXXXXX"
+#endif	/* __ANDROID__ */
+
 struct cpu_data {
 	/* the first two never change */
 	unsigned long long	file_offset;

tracecmd/trace-setup-guest.c

diff --git a/tracecmd/trace-setup-guest.c b/tracecmd/trace-setup-guest.c
index 899848c..f20b48e 100644
--- a/tracecmd/trace-setup-guest.c
+++ b/tracecmd/trace-setup-guest.c
@@ -124,7 +124,12 @@
 	char cmd[PATH_MAX], xml[PATH_MAX];
 	int i, fd, ret = 0;
 
+#ifdef __ANDROID__
+	strcpy(tmp_path, "/data/local/tmp/pipexmlXXXXXX");
+#else	/* !__ANDROID__ */
 	strcpy(tmp_path, "/tmp/pipexmlXXXXXX");
+#endif	/* __ANDROID__ */
+
 	fd = mkstemp(tmp_path);
 	if (fd < 0)
 		return fd;