Revert "lpmake: Don't assume a device is retrofit if it has one block device for...

This reverts commit 13945230d36282a0dd2ad7c240f2b88ffc506205.

Reason for revert: Potential culprit for Bug b/144809373 - verifying through Forrest before revert submission

Change-Id: Ic4ed750a5386f6f45a871ac7112142a6991dfd2c

diff --git a/partition_tools/lpmake.cc b/partition_tools/lpmake.cc
index 32be8dc..4281477 100644 (file)
--- a/partition_tools/lpmake.cc
+++ b/partition_tools/lpmake.cc
@@ -358,7 +358,7 @@ int main(int argc, char* argv[]) {
 
     std::unique_ptr<LpMetadata> metadata = builder->Export();
     if (!images.empty() || force_full_image) {
-        if (block_devices.size() == 1 && super_name == "super") {
+        if (block_devices.size() == 1) {
             if (!WriteToImageFile(output_path.c_str(), *metadata.get(), block_size, images,
                                   output_sparse)) {
                 return EX_CANTCREAT;