Merge "Make compsvc works in VM"
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 174916b..a8dcba8 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -74,7 +74,6 @@
"linkerconfig",
"servicemanager",
"tombstoned",
- "wait_for_keymaster",
"cgroups.json",
"public.libraries.android.txt",
diff --git a/microdroid/init.rc b/microdroid/init.rc
index 4155da3..861b032 100644
--- a/microdroid/init.rc
+++ b/microdroid/init.rc
@@ -112,8 +112,6 @@
on late-fs
start vendor.keymint-default
- exec_start wait_for_keymaster
-
# TODO(b/185767624): change the hard-coded size?
mount tmpfs tmpfs /data noatime nosuid nodev rw size=128M
diff --git a/microdroid/sepolicy/system/private/file_contexts b/microdroid/sepolicy/system/private/file_contexts
index 5615e75..c4b4b2c 100644
--- a/microdroid/sepolicy/system/private/file_contexts
+++ b/microdroid/sepolicy/system/private/file_contexts
@@ -364,7 +364,6 @@
/system/bin/stats u:object_r:stats_exec:s0
/system/bin/statsd u:object_r:statsd_exec:s0
/system/bin/bpfloader u:object_r:bpfloader_exec:s0
-/system/bin/wait_for_keymaster u:object_r:wait_for_keymaster_exec:s0
/system/bin/watchdogd u:object_r:watchdogd_exec:s0
/system/bin/apexd u:object_r:apexd_exec:s0
/system/bin/gsid u:object_r:gsid_exec:s0
diff --git a/microdroid/sepolicy/system/private/keystore.te b/microdroid/sepolicy/system/private/keystore.te
index 3fccf59..0e57045 100644
--- a/microdroid/sepolicy/system/private/keystore.te
+++ b/microdroid/sepolicy/system/private/keystore.te
@@ -29,7 +29,6 @@
get_prop(keystore, keystore_listen_prop)
-# Keystore needs to transfer binder references to vold and wait_for_keymaster so that they
+# Keystore needs to transfer binder references to vold so that it
# can call keystore methods on those references.
allow keystore vold:binder transfer;
-allow keystore wait_for_keymaster:binder transfer;
diff --git a/microdroid/sepolicy/system/private/wait_for_keymaster.te b/microdroid/sepolicy/system/private/wait_for_keymaster.te
deleted file mode 100644
index da98e2e..0000000
--- a/microdroid/sepolicy/system/private/wait_for_keymaster.te
+++ /dev/null
@@ -1,15 +0,0 @@
-# wait_for_keymaster service
-type wait_for_keymaster, domain, coredomain;
-type wait_for_keymaster_exec, system_file_type, exec_type, file_type;
-
-init_daemon_domain(wait_for_keymaster)
-
-hal_client_domain(wait_for_keymaster, hal_keymaster)
-
-allow wait_for_keymaster kmsg_device:chr_file w_file_perms;
-
-# wait_for_keymaster needs to find keystore and call methods with the returned
-# binder reference.
-binder_use(wait_for_keymaster)
-allow wait_for_keymaster keystore_service:service_manager find;
-binder_call(wait_for_keymaster, keystore)