Merge "Add method to get list of VMs for vm tool."
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index f19abd1..a6b1f95 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,7 +1,12 @@
[Builtin Hooks]
+aidl_format = true
+android_test_mapping_format = true
bpfmt = true
clang_format = true
+jsonlint = true
+pylint3 = true
rustfmt = true
+xmllint = true
[Builtin Hooks Options]
clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 488765f..c654600 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -14,14 +14,8 @@
"proc",
"sys",
- // TODO(b/180267599): clean up unnecessary partition mount points
"system",
- "system_ext",
"vendor",
- "vendor_dlkm",
- "product",
- "odm",
- "odm_dlkm",
"debug_ramdisk",
"mnt",
diff --git a/microdroid/init.rc b/microdroid/init.rc
index 2c32b28..e70fb77 100644
--- a/microdroid/init.rc
+++ b/microdroid/init.rc
@@ -113,40 +113,12 @@
seclabel u:r:shell:s0
setenv HOSTNAME console
-service servicemanager /system/bin/servicemanager
- class core animation
- user system
- group system readproc
- critical
- # TODO(b/179342589): uncomment after turning off APEX session on microdroid
- # onrestart restart apexd
- onrestart class_restart main
- shutdown critical
-
-service logd /system/bin/logd
- socket logd stream 0666 logd logd
- socket logdr seqpacket 0666 logd logd
- socket logdw dgram+passcred 0222 logd logd
- file /proc/kmsg r
- file /dev/kmsg w
- user logd
- group logd system package_info readproc
- capabilities SYSLOG AUDIT_CONTROL
- priority 10
-
-service logd-reinit /system/bin/logd --reinit
- oneshot
+# TODO(b/181093750): remove these after adding apex support
+service adbd /system/bin/adbd --root_seclabel=u:r:su:s0
+ class core
+ socket adbd seqpacket 660 system system
disabled
- user logd
- group logd
-
-# Limit SELinux denial generation to 5/second
-service logd-auditctl /system/bin/auditctl -r 5
- oneshot
- disabled
- user logd
- group logd
- capabilities AUDIT_CONTROL
+ seclabel u:r:adbd:s0
on fs
write /dev/event-log-tags "# content owned by logd
@@ -157,26 +129,3 @@
on property:sys.boot_completed=1
start logd-auditctl
-service adbd /system/bin/adbd --root_seclabel=u:r:su:s0
- class core
- socket adbd seqpacket 660 system system
- disabled
- seclabel u:r:adbd:s0
-
-#TODO(b/179342589): uncomment after turning off APEX session on microdroid
-#service apexd /system/bin/apexd
-# interface aidl apexservice
-# class core
-# user root
-# group system
-# oneshot
-# disabled # does not start with the core class
-# reboot_on_failure reboot,apexd-failed
-
-service apexd-bootstrap /system/bin/apexd --bootstrap
- user root
- group system
- oneshot
- disabled
- reboot_on_failure reboot,bootloader,bootstrap-apexd-failed
-
diff --git a/vm/Android.bp b/vm/Android.bp
index 8fe7ae9..0de6cae 100644
--- a/vm/Android.bp
+++ b/vm/Android.bp
@@ -1,3 +1,7 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
rust_binary {
name: "vm",
crate_name: "vm",