From 7b4010f4d2861510cd2c8b056123d9894d145e3d Mon Sep 17 00:00:00 2001 From: Daniele Di Proietto Date: Mon, 11 Jul 2022 16:25:24 +0000 Subject: Revert "Add a warning to the atrace binary for deprecating vendo..." Revert "Update atrace host test to check stderr/stdout separately" Revert submission 2120422-atrace_warn Reason for revert: The atrace CLI tool will not be immediately deprecated, only the HAL. Actually perfetto uses the atrace CLI tool and the warning message is reported as an error in captured traces. Reverted Changes: I9f054e6b0:Add a warning to the atrace binary for deprecating... If91740d65:Update atrace host test to check stderr/stdout sep... Bug: 204935495 Change-Id: If58157fdb91db7ff8d115b6efd4a424687274302 --- cmds/atrace/atrace.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp index b94f3daf03..9bd733d04c 100644 --- a/cmds/atrace/atrace.cpp +++ b/cmds/atrace/atrace.cpp @@ -1194,11 +1194,6 @@ int main(int argc, char **argv) bool traceStream = false; bool onlyUserspace = false; - fprintf(stderr, - "** Warning: atrace will end vendor support in the next Android Release. **\n" - "** Perfetto is the suggested replacement tool. It will gain vendor **\n" - "** support. See https://perfetto.dev/docs/quickstart/android-tracing **\n\n"); - if (argc == 2 && 0 == strcmp(argv[1], "--help")) { showHelp(argv[0]); exit(0); -- cgit v1.2.3-59-g8ed1b