just hard code rather than deal with circular deps

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name hard-code-build-number.patch

diff --git a/system/core/adb/adb.cpp b/system/core/adb/adb.cpp
index 460ddde55b23eef22f38beeffc7109880fec48f5..a2a766b692fc2c1d4063a79e19548486bc19b83f 100644 (file)
--- 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 @@ std::string adb_version() {
         "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());
 }
 

diff --git a/system/core/fastboot/fastboot.cpp b/system/core/fastboot/fastboot.cpp
index 7fdc28b3da01db87c08cc09d5d1c4240598b98a9..f389aa3cae6f0c08456447e079a9ba2bc5b11995 100644 (file)
--- 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>
 
@@ -1799,7 +1797,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-%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)