StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Treat system_ext as system in container designation" into main am: 6940b7898d am: b0d8105009

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3261300

Change-Id: I2fa3f3306cd29b7d730020fd015930dfbc899f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dennis Shen
2024-09-13 02:20:12 +00:00
committed by Automerger Merge Worker
parent 5bbf6701eb b0d8105009
commit 1760706461
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/aconfig/aconfig/src/commands.rs
View File

@@ -79,8 +79,18 @@ pub fn parse_flags(
.read_to_string(&mut contents)
.with_context(|| format!("failed to read {}", input.source))?;
let flag_declarations = aconfig_protos::flag_declarations::try_from_text_proto(&contents)
.with_context(|| input.error_context())?;
let mut flag_declarations =
aconfig_protos::flag_declarations::try_from_text_proto(&contents)
.with_context(|| input.error_context())?;
// system_ext flags should be treated as system flags as we are combining /system_ext
// and /system as one container
// TODO: remove this logic when we start enforcing that system_ext cannot be set as
// container in aconfig declaration files.
if flag_declarations.container() == "system_ext" {
flag_declarations.set_container(String::from("system"));
}
ensure!(
package == flag_declarations.package(),
"failed to parse {}: expected package {}, got {}",