Update microdroid's built-in apexes

i18n apex is non-updatable and has no-hashtree in its payload image.
Without hashtree, apex can't be dm-verity mounted. So microroid should
have the apex as a built-in (in /system/apex) so that it can be directly
loop-mounted.

Bug: n/a
Test: MicrodroidHostTestCases
Change-Id: Iea5d9cd7b39e909259ed452258395cfb20804f70
This commit is contained in:
Jooyung Han 2021-09-08 22:46:42 +09:00
parent 6606ce3205
commit 1c2d758996
2 changed files with 4 additions and 2 deletions

View File

@ -101,7 +101,10 @@ android_system_image {
multilib: {
common: {
deps: [
// non-updatable & mandatory apexes
"com.android.i18n",
"com.android.runtime",
"microdroid_plat_sepolicy.cil",
"microdroid_plat_mapping_file",
],

View File

@ -31,8 +31,7 @@ use vmconfig::open_parcel_file;
/// The list of APEXes which microdroid requires.
// TODO(b/192200378) move this to microdroid.json?
const MICRODROID_REQUIRED_APEXES: [&str; 3] =
["com.android.adbd", "com.android.i18n", "com.android.os.statsd"];
const MICRODROID_REQUIRED_APEXES: [&str; 2] = ["com.android.adbd", "com.android.os.statsd"];
const APEX_INFO_LIST_PATH: &str = "/apex/apex-info-list.xml";