From 1fd46dfa7266337324ca4429676a278a904192ba Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 30 Mar 2017 15:08:28 -0700 Subject: [PATCH] Show install path in "adb --version" and "fastboot --version". Bug: http://b/36766455 Bug: http://b/34691048 Test: ran tests Change-Id: I4b67ec54d41a281fe7a33c017d3cfbc8055e3b43 --- adb/adb.cpp | 10 ++++++---- fastboot/fastboot.cpp | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/adb/adb.cpp b/adb/adb.cpp index 577e9b996..cf6b3593d 100644 --- a/adb/adb.cpp +++ b/adb/adb.cpp @@ -59,10 +59,12 @@ using namespace std::chrono_literals; std::string adb_version() { // 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", - ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, - ADB_REVISION); + return android::base::StringPrintf( + "Android Debug Bridge version %d.%d.%d\n" + "Revision %s\n" + "Installed as %s\n", + ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, ADB_REVISION, + android::base::GetExecutablePath().c_str()); } void fatal(const char *fmt, ...) { diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 2927b16ca..a99ba23e5 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -1536,6 +1536,7 @@ int main(int argc, char **argv) setvbuf(stderr, nullptr, _IONBF, 0); } else if (strcmp("version", longopts[longindex].name) == 0) { fprintf(stdout, "fastboot version %s\n", FASTBOOT_REVISION); + fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str()); return 0; } else if (strcmp("slot", longopts[longindex].name) == 0) { slot_override = std::string(optarg);