From 977afeb697edb2ab413259e9a444bdb6c9840c7a Mon Sep 17 00:00:00 2001 From: Cody Caldwell Date: Wed, 20 Nov 2019 20:36:12 +0000 Subject: [PATCH] Revert "lpmake: Don't assume a device is retrofit if it has one block device for super." This reverts commit 13945230d36282a0dd2ad7c240f2b88ffc506205. Reason for revert: Potential culprit for Bug b/144809373 - verifying through Forrest before revert submission Change-Id: Ic4ed750a5386f6f45a871ac7112142a6991dfd2c --- partition_tools/lpmake.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/partition_tools/lpmake.cc b/partition_tools/lpmake.cc index 32be8dc5..42814772 100644 --- a/partition_tools/lpmake.cc +++ b/partition_tools/lpmake.cc @@ -358,7 +358,7 @@ int main(int argc, char* argv[]) { std::unique_ptr 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; -- 2.11.0