commit d00a31045635157ca71bb17d787c31ed63bfbb90
author Daniele Di Proietto <ddiproietto@google.com> Fri Jul 22 11:21:01 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 22 11:21:01 2022 +0000
tree 755bc7d4500fbea868d75bdc33f47f8eb59d7a3e
parent 5189c8e2fb2c1501e5e0ffef20b0acd9de4f05e2
parent 80f78ab4e316dc3f9e3ec8881473b15e4666b897

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>

cmds/atrace/atrace.cpp

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