Replace base string utils with android::base ones
Test: th
Change-Id: I62c1dfb24ec1dae3cdc5e0a0a93ea2b48e9967e5
diff --git a/payload_consumer/partition_writer.cc b/payload_consumer/partition_writer.cc
index a415100..17763ea 100644
--- a/payload_consumer/partition_writer.cc
+++ b/payload_consumer/partition_writer.cc
@@ -29,7 +29,6 @@
#include <vector>
#include <base/strings/string_number_conversions.h>
-#include <base/strings/string_util.h>
#include <android-base/stringprintf.h>
#include "update_engine/common/error_code.h"
@@ -333,7 +332,7 @@
static_cast<uint64_t>(ext.num_blocks())));
}
LOG(ERROR) << "Operation source (offset:size) in blocks: "
- << base::JoinString(source_extents, ",");
+ << android::base::Join(source_extents, ",");
// Log remount history if this device is an ext4 partition.
LogMountHistory(source_fd);