Description: just hard code rather than deal with circular deps Forwarded: not-needed --- a/adb/adb.cpp +++ b/adb/adb.cpp @@ -44,8 +44,6 @@ #include #include #include -#include -#include #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, "alt", android::base::GetExecutablePath().c_str()); } --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -58,9 +58,7 @@ #include #include #include -#include #include -#include #include #include @@ -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, "alt"); fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str()); return 0; #if !defined(_WIN32)