commit 1886189c01f857d87f811e6ed15ad23b93ddf67e
author Dan Willemsen <dwillemsen@google.com> Wed Aug 29 14:58:02 2018 -0700
committer Dan Willemsen <dwillemsen@google.com> Thu Aug 30 11:28:18 2018 -0700
tree 87d5b390b7b087a9497bef6d4affcdf8b20b3afb
parent 915031009543608c2394fd4b1835d2f00c9783b6

Convert fastboot to Soong

Also fix adb's version number to match.

See build/soong/README.md for more information.

Test: cd system/core/fastboot; mma
Test: fastboot --version
Test: adb --version
Test: out/host/linux-x86/nativetest/fastboot_test/fastboot_test
Test: out/host/linux-x86/nativetest64/fastboot_test/fastboot_test
Change-Id: I65ea39af9183c602e84f3bc0e4a0d066a30fc464

adb.cpp

diff --git a/adb.cpp b/adb.cpp
index 8e028f4..791899e 100644
--- a/adb.cpp
+++ b/adb.cpp
@@ -45,6 +45,7 @@
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
 #include <build/version.h>
+#include <platform_tools_version.h>
 
 #include "adb_auth.h"
 #include "adb_io.h"
@@ -65,10 +66,11 @@
     // Don't change the format of this --- it's parsed by ddmlib.
     return android::base::StringPrintf(
         "Android Debug Bridge version %d.%d.%d\n"
-        "Version %s\n"
+        "Version %s-%s\n"
         "Installed as %s\n",
         ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION,
-        android::build::GetBuildNumber().c_str(), android::base::GetExecutablePath().c_str());
+        PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str(),
+        android::base::GetExecutablePath().c_str());
 }
 
 void fatal(const char *fmt, ...) {