commit d06a6796cfcedd102945807d2fd8e1e72b87d285
author Kelvin Zhang <zhangkelvin@google.com> Mon Nov 16 18:32:09 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 16 18:32:09 2020 +0000
tree eb61c87fc8a2c22c90cf378a521fb30ca87ad5c8
parent c2a4fa13a4f9d009a6d9a5f521d428c64ee3161f
parent 6bd5cd4e9c7763b5a32e58ad62084cf689d4caff

Add `full_boot` option to brillo_update_payload am: 999705e45c am: 6bd5cd4e9c

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1486136

Change-Id: I1bac9c2108047d630b807aee58edbe4d23b0d6bd

payload_generator/delta_diff_generator.cc

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());
       }
 

scripts/brillo_update_payload

diff --git a/scripts/brillo_update_payload b/scripts/brillo_update_payload
index 3bc87bd..4137dfd 100755
--- a/scripts/brillo_update_payload
+++ b/scripts/brillo_update_payload
@@ -649,7 +649,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