Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cc2d10a authored by Jeremy Meyer's avatar Jeremy Meyer Committed by Android (Google) Code Review
Browse files

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

parents ed8434c7 7f592a8a

tools/aapt2/util/Util.cpp

+9 −2
Original line number Diff line number Diff line
@@ -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());

}