Auto detect minor version for complete partial updates am: 2a18e85a31 am: 618a20ff2b am: a536adead2
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2770381
Change-Id: If0c7a32b52d47a691cea8d967b957daa1d0e5e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc
index 9afa805..5ffd05e 100644
--- a/payload_generator/generate_delta_main.cc
+++ b/payload_generator/generate_delta_main.cc
@@ -736,13 +736,13 @@
if (FLAGS_minor_version == -1) {
// Autodetect minor_version by looking at the update_engine.conf in the old
// image.
- if (payload_config.is_delta) {
- LOG(FATAL) << "Minor version is required for delta update!";
- return 1;
- } else if (FLAGS_is_partial_update) {
+ if (FLAGS_is_partial_update) {
payload_config.version.minor = kPartialUpdateMinorPayloadVersion;
LOG(INFO) << "Using minor_version=" << payload_config.version.minor
<< " for partial updates";
+ } else if (payload_config.is_delta) {
+ LOG(FATAL) << "Minor version is required for complete delta update!";
+ return 1;
} else {
payload_config.version.minor = kFullPayloadMinorVersion;
LOG(INFO) << "Using non-delta minor_version="