Add `full_boot` option to brillo_update_payload am: 999705e45c am: 6bd5cd4e9c am: d06a6796cf am: 180270e5d6
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1486136
Change-Id: Ia5382c8418bed2f5bd64d444eeaedd05baf82491
diff --git a/payload_generator/delta_diff_generator.cc b/payload_generator/delta_diff_generator.cc
index 47c92e0..74d43fd 100644
--- a/payload_generator/delta_diff_generator.cc
+++ b/payload_generator/delta_diff_generator.cc
@@ -197,10 +197,12 @@
unique_ptr<OperationsGenerator> strategy;
if (!old_part.path.empty()) {
// Delta update.
- LOG(INFO) << "Using generator ABGenerator().";
+ LOG(INFO) << "Using generator ABGenerator() for partition "
+ << new_part.name;
strategy.reset(new ABGenerator());
} else {
- LOG(INFO) << "Using generator FullUpdateGenerator().";
+ LOG(INFO) << "Using generator FullUpdateGenerator() for partition "
+ << new_part.name;
strategy.reset(new FullUpdateGenerator());
}
diff --git a/scripts/brillo_update_payload b/scripts/brillo_update_payload
index 77d372c..6c90d97 100755
--- a/scripts/brillo_update_payload
+++ b/scripts/brillo_update_payload
@@ -651,7 +651,12 @@
fi
partition_names+="${part}"
new_partitions+="${DST_PARTITIONS[${part}]}"
- old_partitions+="${SRC_PARTITIONS[${part}]:-}"
+ if [ "${FLAGS_full_boot}" == "true" ] && [ "${part}" == "boot" ]; then
+ # Skip boot partition.
+ old_partitions+=""
+ else
+ old_partitions+="${SRC_PARTITIONS[${part}]:-}"
+ fi
new_mapfiles+="${DST_PARTITIONS_MAP[${part}]:-}"
old_mapfiles+="${SRC_PARTITIONS_MAP[${part}]:-}"
done