Merge "Revert "Add a warning to the atrace binary for deprecating vendo..."" am: 71e68dcfc4 am: fb78bc1c5a am: b84e614a65 am: 80f78ab4e3

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2149974

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

1 files changed, 0 insertions, 5 deletions

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index b37a4574ca..6fb9a4d112 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -1195,11 +1195,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);