commit caa9d86fb16b4a682f888cc1c3f5bdc108c1d7cc
author Sen Jiang <senj@google.com> Wed Aug 23 19:32:58 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Mon Aug 28 15:24:09 2017 -0700
tree 2dad1b5ef87823eca2a68ec6eed1b76d3dab10ed
parent ddbf8f0521904514e76eecaf13c1ebfec84c64dc

Don't fill in partitions in InstallPlan in ApplyPayload.

Partitions are filled in by DeltaPerformer based on information
in the payload and BootControl, existing partitions in InstallPlan
are ignored.

BUG=none
TEST=brillo_update_payload verify

Change-Id: Ia4326ba4671b5e74c2f898d3b29701acbf491a7b
(cherry picked from commit 4136062ed805d8d078998e3a3cff56754c474396)
Reviewed-on: https://chromium-review.googlesource.com/638555
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Sen Jiang <senj@chromium.org>

payload_generator/generate_delta_main.cc

diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc
index 7524cc9..96915c1 100644
--- a/payload_generator/generate_delta_main.cc
+++ b/payload_generator/generate_delta_main.cc
@@ -38,7 +38,6 @@
 #include "update_engine/payload_consumer/delta_performer.h"
 #include "update_engine/payload_consumer/payload_constants.h"
 #include "update_engine/payload_generator/delta_diff_generator.h"
-#include "update_engine/payload_generator/delta_diff_utils.h"
 #include "update_engine/payload_generator/payload_generation_config.h"
 #include "update_engine/payload_generator/payload_signer.h"
 #include "update_engine/payload_generator/xz.h"
@@ -198,31 +197,22 @@
       config.is_delta ? InstallPayloadType::kDelta : InstallPayloadType::kFull;
 
   for (size_t i = 0; i < config.target.partitions.size(); i++) {
-    InstallPlan::Partition part;
-    part.name = config.target.partitions[i].name;
-    part.target_path = config.target.partitions[i].path;
+    const string& part_name = config.target.partitions[i].name;
+    const string& target_path = config.target.partitions[i].path;
     fake_boot_control.SetPartitionDevice(
-        part.name, install_plan.target_slot, part.target_path);
+        part_name, install_plan.target_slot, target_path);
 
+    string source_path;
     if (config.is_delta) {
       TEST_AND_RETURN_FALSE(config.target.partitions.size() ==
                             config.source.partitions.size());
-      PartitionInfo part_info;
-      TEST_AND_RETURN_FALSE(diff_utils::InitializePartitionInfo(
-          config.source.partitions[i], &part_info));
-      part.source_hash.assign(part_info.hash().begin(), part_info.hash().end());
-      part.source_path = config.source.partitions[i].path;
-
+      source_path = config.source.partitions[i].path;
       fake_boot_control.SetPartitionDevice(
-          part.name, install_plan.source_slot, part.source_path);
+          part_name, install_plan.source_slot, source_path);
     }
 
-    install_plan.partitions.push_back(part);
-
     LOG(INFO) << "Install partition:"
-              << " source: " << part.source_path
-              << " target: " << part.target_path;
-
+              << " source: " << source_path << " target: " << target_path;
   }
 
   DeltaPerformer performer(&prefs,