commit cdf2ac058e6b9273df185774ba03e7e2f0c676d0
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 05 23:24:09 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 05 23:24:09 2024 +0000
tree 0aebc783e2c94abace2e14eef95c324e6b40df1a
parent 2f5dc1193e8b7ff90297fa543356b2e5acbcbdc6
parent 82459276b2cfa350ae34fbeaf58263c37796ead9

Snap for 12460198 from 82459276b2cfa350ae34fbeaf58263c37796ead9 to 25Q2-release

Change-Id: Ic4d2cdb0949e92bf13bc3968876da5056b1cd1c9

Android.bp

diff --git a/Android.bp b/Android.bp
index 0cbf286..89dea90 100644
--- a/Android.bp
+++ b/Android.bp
@@ -503,6 +503,29 @@
     ],
 }
 
+aidl_interface {
+    name: "libupdate_engine_aidl_interface",
+    srcs: [
+        ":libupdate_engine_aidl",
+    ],
+    backend: {
+        cpp: {
+            enabled: false,
+        },
+        java: {
+            enabled: false,
+        },
+        ndk: {
+            enabled: false,
+        },
+        rust: {
+            enabled: true,
+        },
+    },
+    frozen: false,
+    unstable: true,
+}
+
 cc_defaults {
     name: "libupdate_engine_android_defaults",
     defaults: [

OWNERS

diff --git a/OWNERS b/OWNERS
index 58ecfe1..1900cf4 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,9 +2,7 @@
 
 # Android et. al. maintainers:
 deymo@google.com
-elsk@google.com
 senj@google.com
-xunchang@google.com
 zhangkelvin@google.com
 
 # Chromium OS maintainers:

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,