Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dont include day/time or ldap for eng aapt2 builds"

Browse Source
This commit is contained in:
Jeremy Meyer
2021-11-02 18:48:57 +00:00
committed by Android (Google) Code Review
parent ed8434c72d 7f592a8a35
commit 9cc2d10a93
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/aapt2/util/Util.cpp
View File

@@ -22,9 +22,9 @@
#include <vector>
#include "android-base/stringprintf.h"
#include "android-base/strings.h"
#include "androidfw/StringPiece.h"
#include "build/version.h"
#include "text/Unicode.h"
#include "text/Utf8Iterator.h"
#include "util/BigBuffer.h"
@@ -231,7 +231,14 @@ std::string GetToolFingerprint() {
static const char* const sMinorVersion = "19";
// The build id of aapt2 binary.
static const std::string sBuildId = android::build::GetBuildNumber();
static std::string sBuildId = android::build::GetBuildNumber();
if (android::base::StartsWith(sBuildId, "eng.")) {
time_t now = time(0);
tm* ltm = localtime(&now);
sBuildId = android::base::StringPrintf("eng.%d%d", 1900 + ltm->tm_year, 1 + ltm->tm_mon);
}
return android::base::StringPrintf("%s.%s-%s", sMajorVersion, sMinorVersion, sBuildId.c_str());
}