adb: use soong version stamping.
Bug: http://b/71719137
Test: adb version
Change-Id: Ic735814574c83a7c2b8bef213592d494f5ec3860
diff --git a/adb/Android.bp b/adb/Android.bp
index 1310b06..ef425c1 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -30,6 +30,8 @@
"-Wthread-safety",
],
+ use_version_lib: true,
+
compile_multilib: "first",
product_variables: {
debuggable: {
diff --git a/adb/adb.cpp b/adb/adb.cpp
index 38eb1f5..90ee7b4 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -44,6 +44,7 @@
#include <android-base/parsenetaddress.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
+#include <build/version.h>
#include "adb_auth.h"
#include "adb_io.h"
@@ -64,10 +65,10 @@
// 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 TODO: b/71719137\n"
+ "Version %s\n"
"Installed as %s\n",
ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION,
- android::base::GetExecutablePath().c_str());
+ android::build::GetBuildNumber().c_str(), android::base::GetExecutablePath().c_str());
}
void fatal(const char *fmt, ...) {