Revert "Cleaned up some slot logic"
This reverts commit bd85a18d0bcdd3041357c846905c737f10732320.
Reason for revert: b/276759363
Change-Id: I3ba08cf4abeeb7769569512d50e7ff135438cf20
diff --git a/fastboot/fastboot.h b/fastboot/fastboot.h
index 029b583..c954487 100644
--- a/fastboot/fastboot.h
+++ b/fastboot/fastboot.h
@@ -80,7 +80,8 @@
bool skip_secondary = false;
bool force_flash = false;
- std::string slot_override;
+ std::string slot;
+ std::string current_slot;
std::string secondary_slot;
fastboot::FastBootDriver* fb;
};
@@ -102,7 +103,7 @@
Result<NetworkSerial, FastbootError> ParseNetworkSerial(const std::string& serial);
bool supports_AB();
-std::string GetPartitionName(const ImageEntry& entry);
+std::string GetPartitionName(const ImageEntry& entry, std::string& current_slot_);
void flash_partition_files(const std::string& partition, const std::vector<SparsePtr>& files);
int64_t get_sparse_limit(int64_t size);
std::vector<SparsePtr> resparse_file(sparse_file* s, int64_t max_size);