diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-11-23 06:34:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-23 06:34:04 +0000 |
| commit | 9ae8a3b36dc387f23a6f4b4a9d1f71c8fb4415e5 (patch) | |
| tree | 963ff30204aa75d49afd4ab80365ce5ab54744b7 /lib/trace-cmd/include/private/trace-cmd-private.h | |
| parent | 77c70632b05b7e2d91bb56873af8b95afb8babeb (diff) | |
| parent | ff64d3e1a8abde3e3cb326ac2f36184285f15687 (diff) | |
| download | trace-cmd-9ae8a3b36dc387f23a6f4b4a9d1f71c8fb4415e5.tar.gz | |
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_341810000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341811030aml_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-releaseaml_rkp_341810000aml_hef_341811030
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>
Diffstat (limited to 'lib/trace-cmd/include/private/trace-cmd-private.h')
| -rw-r--r-- | lib/trace-cmd/include/private/trace-cmd-private.h | 5 |
1 files changed, 5 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; |