Add vold and keymint related services
These are for encrypting /data partition. Also vintf related xmls are
added for the services.
Bug: 185767624
Bug: 188013319
Test: boot microdroid
Change-Id: Ie511e2b4f3565fef181cc57588c2e107182f1961
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 30fec88..894a1ec 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -69,14 +69,25 @@
"apexd",
"debuggerd",
+ "e2fsck",
+ "keystore2",
"linker",
"linkerconfig",
"servicemanager",
"tombstoned",
+ "tune2fs",
+ "vdc",
+ "vold",
+ "wait_for_keymaster",
"cgroups.json",
"public.libraries.android.txt",
+ // TODO(b/185767624): remove hidl after full keymint support
+ "hwservicemanager",
+
"plat_sepolicy_and_mapping.sha256",
+ "microdroid_compatibility_matrix",
+ "microdroid_manifest",
] + microdroid_shell_and_utilities,
multilib: {
common: {
@@ -145,9 +156,12 @@
name: "microdroid_vendor",
use_avb: true,
deps: [
+ "android.hardware.security.keymint-service",
"microdroid_fstab",
"microdroid_precompiled_sepolicy",
"microdroid_precompiled_sepolicy.plat_sepolicy_and_mapping.sha256",
+ "microdroid_vendor_manifest",
+ "microdroid_vendor_compatibility_matrix",
],
multilib: {
common: {
@@ -428,3 +442,35 @@
name: "microdroid_payload.json",
src: "microdroid_payload.json",
}
+
+prebuilt_etc {
+ name: "microdroid_vendor_manifest",
+ src: "microdroid_vendor_manifest.xml",
+ filename: "manifest.xml",
+ relative_install_path: "vintf",
+ installable: false,
+}
+
+prebuilt_etc {
+ name: "microdroid_vendor_compatibility_matrix",
+ src: "microdroid_vendor_compatibility_matrix.xml",
+ filename: "compatibility_matrix.xml",
+ relative_install_path: "vintf",
+ installable: false,
+}
+
+prebuilt_etc {
+ name: "microdroid_compatibility_matrix",
+ src: "microdroid_compatibility_matrix.xml",
+ filename: "compatibility_matrix.current.xml",
+ relative_install_path: "vintf",
+ installable: false,
+}
+
+prebuilt_etc {
+ name: "microdroid_manifest",
+ src: "microdroid_manifest.xml",
+ filename: "manifest.xml",
+ relative_install_path: "vintf",
+ installable: false,
+}