commit cded753432738211395b82288d2e401edb1495ee
author Elliott Hughes <enh@google.com> Mon May 08 11:30:34 2017 -0700
committer Elliott Hughes <enh@google.com> Tue May 09 08:21:54 2017 -0700
tree d07baf7e45acbfa5d29fc34bd480f5f9ec213024
parent 16f6be7e9f04e08364f0db069203dabccc5ced1b

Show the "platform tools" version in adb/fastboot --version.

Annoyingly folks parse the "adb --version" output so we have the
less-interesting protocol version first. But at least now we'll
have the "real" version somewhere...

Bug: N/A
Test: "adb --version"/"fastboot --version"
Change-Id: Ia85b561bd8d84c6fd6995923730d36f53b2f800b

adb.cpp

diff --git a/adb.cpp b/adb.cpp
index 0181daa..c1e0d98 100644
--- a/adb.cpp
+++ b/adb.cpp
@@ -64,9 +64,9 @@
     // Don't change the format of this --- it's parsed by ddmlib.
     return android::base::StringPrintf(
         "Android Debug Bridge version %d.%d.%d\n"
-        "Revision %s\n"
+        "Version %s\n"
         "Installed as %s\n",
-        ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, ADB_REVISION,
+        ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, ADB_VERSION,
         android::base::GetExecutablePath().c_str());
 }