commit ed8111f5bb161900ddc706cc43ad2731b1207178
author Kelvin Zhang <zhangkelvin@google.com> Thu Oct 03 20:24:34 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 03 20:24:34 2024 +0000
tree 0aebc783e2c94abace2e14eef95c324e6b40df1a
parent 86074e8d4d092f415a5d05294201e2276c535434
parent 99da2214e46472d91e181962ce29e9e94a1ad814

Fix partial extraction feature in ota_extractor am: 99da2214e4

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

Change-Id: I845ca1f6cc6d04f379ab9d3154c5a8b2dba2ab37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

aosp/ota_extractor.cc

diff --git a/aosp/ota_extractor.cc b/aosp/ota_extractor.cc
index 42270f4..29ba44c 100644
--- a/aosp/ota_extractor.cc
+++ b/aosp/ota_extractor.cc
@@ -206,6 +206,10 @@
 
   if (FLAGS_single_thread) {
     for (const auto& partition : manifest.partitions()) {
+      if (!partitions.empty() &&
+          partitions.count(partition.partition_name()) == 0) {
+        continue;
+      }
       if (!ExtractImageFromPartition(manifest,
                                      partition,
                                      data_begin,
@@ -221,6 +225,10 @@
   } else {
     std::vector<std::pair<std::future<bool>, std::string>> futures;
     for (const auto& partition : manifest.partitions()) {
+      if (!partitions.empty() &&
+          partitions.count(partition.partition_name()) == 0) {
+        continue;
+      }
       futures.push_back(std::make_pair(std::async(std::launch::async,
                                                   ExtractImageFromPartition,
                                                   manifest,