diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-08-30 23:36:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-30 23:36:54 +0000 |
| commit | 4d8929773b8f74a9959025f5a2c3a0238a3b312b (patch) | |
| tree | f510024bc155f6f6c97ad9b043edd35d407c984f /fastboot/fastboot.cpp | |
| parent | ebb631b0a32556cdeda70d3bf9e6f6460667b42f (diff) | |
| parent | ab971b5e7e506f0df02965f9a19237f2151cd3ce (diff) | |
| download | system_core-4d8929773b8f74a9959025f5a2c3a0238a3b312b.tar.gz system_core-4d8929773b8f74a9959025f5a2c3a0238a3b312b.tar.bz2 system_core-4d8929773b8f74a9959025f5a2c3a0238a3b312b.zip | |
Merge "Convert fastboot to Soong"
Diffstat (limited to 'fastboot/fastboot.cpp')
| -rw-r--r-- | fastboot/fastboot.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 293ff00e8..2887d3b5d 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -55,6 +55,8 @@ #include <android-base/strings.h> #include <android-base/test_utils.h> #include <android-base/unique_fd.h> +#include <build/version.h> +#include <platform_tools_version.h> #include <sparse/sparse.h> #include <ziparchive/zip_archive.h> @@ -1548,7 +1550,7 @@ int FastBootTool::Main(int argc, char* argv[]) { setvbuf(stdout, nullptr, _IONBF, 0); setvbuf(stderr, nullptr, _IONBF, 0); } else if (name == "version") { - fprintf(stdout, "fastboot version %s\n", FASTBOOT_VERSION); + fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str()); fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str()); return 0; #if !defined(_WIN32) |