Search for CompOsPayloadApp/EmptyPayloadApp with extensions
There are Google variants of these apps internally, but currently
they use the `stem` property to rename their final apk to match the
non-google version. This is a problem because these two modules end up
conflicting if they're both exported to make. Currently, the fact that
they're included in apexes hides that they're exported to make, but
we're changing that behavior.
Bug: 254205429
Test: Presubmits
Change-Id: Id3e81650ea41fc4268b69c0ffcf28afa931d8a15
diff --git a/vm/src/run.rs b/vm/src/run.rs
index 5d785de..36edc64 100644
--- a/vm/src/run.rs
+++ b/vm/src/run.rs
@@ -152,7 +152,7 @@
}
fn find_empty_payload_apk_path() -> Result<PathBuf, Error> {
- const GLOB_PATTERN: &str = "/apex/com.android.virt/app/**/EmptyPayloadApp.apk";
+ const GLOB_PATTERN: &str = "/apex/com.android.virt/app/**/EmptyPayloadApp*.apk";
let mut entries: Vec<PathBuf> =
glob(GLOB_PATTERN).context("failed to glob")?.filter_map(|e| e.ok()).collect();
if entries.len() > 1 {