commit 257b52469a7e2c0a1694de8b5648d3a2401ec481
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 04 10:37:20 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 04 10:37:20 2020 +0000
tree 04fd8865bdb4d5724b63f3765b335f03c1e11326
parent fd93e89d124106c3c199d6411421cebe802c096e
parent 46cc752ed27eeca6988e026487b85d345747236c

Fix gsi_tool wipe-data am: 46cc752ed2

Change-Id: I8370c2a591095ca6c899b2de7a345e904bdbb944

gsi_tool.cpp

diff --git a/gsi_tool.cpp b/gsi_tool.cpp
index a38bf20..b059947 100644
--- a/gsi_tool.cpp
+++ b/gsi_tool.cpp
@@ -374,7 +374,7 @@
     }
 
     int error;
-    status = gsid->zeroPartition("userdata", &error);
+    status = gsid->zeroPartition("userdata" + std::string(kDsuPostfix), &error);
     if (!status.isOk() || error) {
         std::cerr << "Could not wipe GSI userdata: " << ErrorMessage(status, error) << "\n";
         return EX_SOFTWARE;

partition_installer.cpp

diff --git a/partition_installer.cpp b/partition_installer.cpp
index 2ac313f..357df50 100644
--- a/partition_installer.cpp
+++ b/partition_installer.cpp
@@ -348,7 +348,7 @@
     uint64_t erase_size = std::min(kEraseSize, get_block_device_size(device->fd()));
     for (uint64_t i = 0; i < erase_size; i += zeroes.size()) {
         if (!android::base::WriteFully(device->fd(), zeroes.data(), zeroes.size())) {
-            PLOG(ERROR) << "write userdata_gsi";
+            PLOG(ERROR) << "write " << name;
             return IGsiService::INSTALL_ERROR_GENERIC;
         }
     }