commit d1bab2d70a04ffa554de2d259a12454f9ec9b0cf
author Kokoa Matsuda <komatsud@google.com> Wed Oct 09 00:59:33 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 09 00:59:33 2024 +0000
tree ae04693bcaa3f5d520325ffd1445b0cb152d5c00
parent 82459276b2cfa350ae34fbeaf58263c37796ead9
parent 228029c9395213032c83958f5f24b68d32cbf781

Use android-base/stringprintf.h instead of base/string/stringprintf.h am: 4f02976254 am: 228029c939

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/3298451

Change-Id: I8ed41b381ad75a638b377f79056c2f17f10333e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

payload_generator/ab_generator.cc

diff --git a/payload_generator/ab_generator.cc b/payload_generator/ab_generator.cc
index 570ce45..c5cd6f3 100644
--- a/payload_generator/ab_generator.cc
+++ b/payload_generator/ab_generator.cc
@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <utility>
 
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
 
 #include "update_engine/common/hash_calculator.h"
 #include "update_engine/common/utils.h"
@@ -147,7 +147,7 @@
 
     AnnotatedOperation new_aop;
     new_aop.op = new_op;
-    new_aop.name = base::StringPrintf("%s:%d", original_aop.name.c_str(), i);
+    new_aop.name = android::base::StringPrintf("%s:%d", original_aop.name.c_str(), i);
     result_aops->push_back(new_aop);
   }
   if (curr_src_ext_index != original_op.src_extents().size() - 1) {
@@ -183,7 +183,7 @@
 
     AnnotatedOperation new_aop;
     new_aop.op = new_op;
-    new_aop.name = base::StringPrintf("%s:%d", original_aop.name.c_str(), i);
+    new_aop.name = android::base::StringPrintf("%s:%d", original_aop.name.c_str(), i);
     TEST_AND_RETURN_FALSE(
         AddDataAndSetType(&new_aop, version, target_part_path, blob_file));
 
@@ -230,7 +230,7 @@
       // merge), are contiguous, are fragmented to have one destination extent,
       // and their combined block count would be less than chunk size, merge
       // them.
-      last_aop.name = base::StringPrintf(
+      last_aop.name = android::base::StringPrintf(
           "%s,%s", last_aop.name.c_str(), curr_aop.name.c_str());
 
       if (is_delta_op) {