commit 3c1291ecab4470d7771366c0e81bc44e064fa006
author Dennis Shen <dzshen@google.com> Thu Mar 06 10:46:55 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 06 10:46:55 2025 -0800
tree 60585159c90196bc62670fdf2d449330c125e9b2
parent 1ae35ff2c6186653dc0ccbed0a4dbaa57bd090f7
parent e2a806ad0862598beee6d87cde7e976ca8670478

Merge "Add debugging trails on Zygote package mapping" into main

aconfigd/src/aconfigd.rs

diff --git a/aconfigd/src/aconfigd.rs b/aconfigd/src/aconfigd.rs
index 7692d20..d255a59 100644
--- a/aconfigd/src/aconfigd.rs
+++ b/aconfigd/src/aconfigd.rs
@@ -113,7 +113,7 @@
     /// storage files and create new boot storage files for each platform
     /// partitions
     pub fn initialize_platform_storage(&mut self) -> Result<(), AconfigdError> {
-        for container in ["system", "product", "vendor"] {
+        for container in ["system", "system_ext", "product", "vendor"] {
             debug!("start initialize {} flags", container);
 
             let aconfig_dir = PathBuf::from("/".to_string() + container + "/etc/aconfig");
@@ -157,7 +157,7 @@
 
         self.storage_manager.apply_staged_ota_flags()?;
 
-        for container in ["system", "product", "vendor"] {
+        for container in ["system", "system_ext", "product", "vendor"] {
             self.storage_manager.apply_all_staged_overrides(container)?;
         }
 
@@ -1094,7 +1094,7 @@
             .unwrap();
         assert_eq!(pb.records.len(), 3);
 
-        for container in ["system", "product", "vendor"] {
+        for container in ["system", "system_ext", "product", "vendor"] {
             let aconfig_dir = PathBuf::from("/".to_string() + container + "/etc/aconfig");
             let default_package_map = aconfig_dir.join("package.map");
             let default_flag_map = aconfig_dir.join("flag.map");