Merge "ANDROID: tracecmd: Fix temp file paths" am: 21202940d0 am: 0362a4a2fa am: ff64d3e1a8HEADandroid-14.0.0_r54android-14.0.0_r53android-14.0.0_r52android-14.0.0_r51android-14.0.0_r50android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr3-s2-releaseandroid14-qpr3-releaseandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release

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>

3 files changed, 20 insertions, 0 deletions

diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h
index 766e0a76..3cc3e9dd 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 @@ enum tracecmd_msg_flags {
 };
 
 /* 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;
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 442b1c5a..8ffdf04b 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -67,14 +67,24 @@ struct zchunk_cache {
 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;
diff --git a/tracecmd/trace-setup-guest.c b/tracecmd/trace-setup-guest.c
index 899848cb..f20b48e2 100644
--- a/tracecmd/trace-setup-guest.c
+++ b/tracecmd/trace-setup-guest.c
@@ -124,7 +124,12 @@ static int attach_guest_fifos(const char *guest, int nr_cpus)
 	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;