Add build number to aapt2 version
This changes adds the build id to the version printed by "aapt2
version". This change also adds a field to the ResourceTable proto that
specifies the fingerprints of tools used to build the table.
Bug: 123663089
Test: manual
Change-Id: Ifaf33c1e506b68e9f1d921fdbeddf36485e65790
diff --git a/tools/aapt2/util/Util.cpp b/tools/aapt2/util/Util.cpp
index 59b7fff..37ce65e 100644
--- a/tools/aapt2/util/Util.cpp
+++ b/tools/aapt2/util/Util.cpp
@@ -21,13 +21,15 @@
#include <string>
#include <vector>
+#include "android-base/stringprintf.h"
#include "androidfw/StringPiece.h"
-#include "utils/Unicode.h"
+#include "build/version.h"
#include "text/Unicode.h"
#include "text/Utf8Iterator.h"
#include "util/BigBuffer.h"
#include "util/Maybe.h"
+#include "utils/Unicode.h"
using ::aapt::text::Utf8Iterator;
using ::android::StringPiece;
@@ -200,6 +202,24 @@
return result;
}
+const char* GetToolName() {
+ static const char* const sToolName = "Android Asset Packaging Tool (aapt)";
+ return sToolName;
+}
+
+std::string GetToolFingerprint() {
+ // DO NOT UPDATE, this is more of a marketing version.
+ static const char* const sMajorVersion = "2";
+
+ // Update minor version whenever a feature or flag is added.
+ static const char* const sMinorVersion = "19";
+
+ // The build id of aapt2 binary.
+ static const std::string sBuildId = android::build::GetBuildNumber();
+
+ return android::base::StringPrintf("%s.%s-%s", sMajorVersion, sMinorVersion, sBuildId.c_str());
+}
+
static size_t ConsumeDigits(const char* start, const char* end) {
const char* c = start;
for (; c != end && *c >= '0' && *c <= '9'; c++) {