| Description: just hard code rather than deal with circular deps |
| Forwarded: not-needed |
| --- a/system/core/adb/adb.cpp |
| +++ b/system/core/adb/adb.cpp |
| @@ -44,8 +44,6 @@ |
| #include <android-base/parsenetaddress.h> |
| #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" |
| @@ -69,7 +67,7 @@ |
| "Version %s-%s\n" |
| "Installed as %s\n", |
| ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, |
| - PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str(), |
| + PLATFORM_TOOLS_VERSION, "debian", |
| android::base::GetExecutablePath().c_str()); |
| } |
| |
| --- a/system/core/fastboot/fastboot.cpp |
| +++ b/system/core/fastboot/fastboot.cpp |
| @@ -59,10 +59,8 @@ |
| #include <android-base/stringprintf.h> |
| #include <android-base/strings.h> |
| #include <android-base/unique_fd.h> |
| -#include <build/version.h> |
| #include <libavb/libavb.h> |
| #include <liblp/liblp.h> |
| -#include <platform_tools_version.h> |
| #include <sparse/sparse.h> |
| #include <ziparchive/zip_archive.h> |
| |
| @@ -1680,7 +1678,7 @@ |
| setvbuf(stdout, nullptr, _IONBF, 0); |
| setvbuf(stderr, nullptr, _IONBF, 0); |
| } else if (name == "version") { |
| - fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str()); |
| + fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, "debian"); |
| fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str()); |
| return 0; |
| #if !defined(_WIN32) |