Remove libchrome stringprintf.h functions am: 11c3da63da am: 9ecd0dced8
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/3316555
Change-Id: Ibfa0ffd4826c49554508c5040bb38ec5719372be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/common/http_fetcher_unittest.cc b/common/http_fetcher_unittest.cc
index ac03729..49d0ebf 100644
--- a/common/http_fetcher_unittest.cc
+++ b/common/http_fetcher_unittest.cc
@@ -26,6 +26,7 @@
#include <utility>
#include <vector>
+#include <android-base/stringprintf.h>
#include <base/bind.h>
#include <base/location.h>
#include <base/logging.h>
@@ -35,7 +36,6 @@
#include <base/stl_util.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_util.h>
-#include <android-base/stringprintf.h>
#if BASE_VER >= 780000 // CrOS
#include <base/task/single_thread_task_executor.h>
#endif // BASE_VER >= 780000
@@ -1123,10 +1123,10 @@
++it) {
string tmp_str = android::base::StringPrintf("%jd+", it->first);
if (it->second > 0) {
- base::StringAppendF(&tmp_str, "%jd", it->second);
+ android::base::StringAppendF(&tmp_str, "%jd", it->second);
multi_fetcher->AddRange(it->first, it->second);
} else {
- base::StringAppendF(&tmp_str, "?");
+ android::base::StringAppendF(&tmp_str, "?");
multi_fetcher->AddRange(it->first);
}
LOG(INFO) << "added range: " << tmp_str;
diff --git a/common/utils.cc b/common/utils.cc
index 191e95a..7baddab 100644
--- a/common/utils.cc
+++ b/common/utils.cc
@@ -39,6 +39,7 @@
#include <utility>
#include <vector>
+#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <base/callback.h>
#include <base/files/file_path.h>
@@ -52,7 +53,6 @@
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_split.h>
#include <base/strings/string_util.h>
-#include <android-base/stringprintf.h>
#include <brillo/data_encoding.h>
#include "update_engine/common/constants.h"
@@ -892,21 +892,21 @@
unsigned usecs = delta.InMicroseconds();
if (days)
- base::StringAppendF(&str, "%ud", days);
+ android::base::StringAppendF(&str, "%ud", days);
if (days || hours)
- base::StringAppendF(&str, "%uh", hours);
+ android::base::StringAppendF(&str, "%uh", hours);
if (days || hours || mins)
- base::StringAppendF(&str, "%um", mins);
- base::StringAppendF(&str, "%u", secs);
+ android::base::StringAppendF(&str, "%um", mins);
+ android::base::StringAppendF(&str, "%u", secs);
if (usecs) {
int width = 6;
while ((usecs / 10) * 10 == usecs) {
usecs /= 10;
width--;
}
- base::StringAppendF(&str, ".%0*u", width, usecs);
+ android::base::StringAppendF(&str, ".%0*u", width, usecs);
}
- base::StringAppendF(&str, "s");
+ android::base::StringAppendF(&str, "s");
return str;
}