commit f0eeee7f3acd7484cd200ba93b37b5cdc51b0422
author Jooyung Han <jooyung@google.com> Thu Sep 09 04:23:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 09 04:23:59 2021 +0000
tree 9c487c94435cbf7b666ac97fc5f651053bb791b6
parent 01b57d28ebe17601c9f7775ae47452394388c597
parent 6419ba3bc699f4c67799f3029966f82a42ee3ce0

Update microdroid's built-in apexes am: 1c2d758996 am: 6419ba3bc6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1821852

Change-Id: I5f767d3b2fa634270ed8f5560b39e7a21926729d

microdroid/Android.bp

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 1638f6f..e4334cb 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -101,7 +101,10 @@
     multilib: {
         common: {
             deps: [
+                // non-updatable & mandatory apexes
+                "com.android.i18n",
                 "com.android.runtime",
+
                 "microdroid_plat_sepolicy.cil",
                 "microdroid_plat_mapping_file",
             ],

virtualizationservice/src/payload.rs

diff --git a/virtualizationservice/src/payload.rs b/virtualizationservice/src/payload.rs
index 75ba6c7..9662fa3 100644
--- a/virtualizationservice/src/payload.rs
+++ b/virtualizationservice/src/payload.rs
@@ -31,8 +31,7 @@
 
 /// 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";