Switch to tombstoned.microdroid

The long term plan is to completely remove tombstoned from microdroid (b/243494912), however it might take time some time to implement it.

In the meantime, we've recently removed cgroups support from the microdroid kernel. This means that starting a tombstoned results in a bunch of non-fatal errors in the logs that are related to the fact that tombstoned service specifies task_profiles.

To get rid of these error messages we temporary add a microdroid variant of the tombstoned (tombstoned.microdroid) that doesn't specify task_profiles.

Bug: 239367015
Test: microdroid presubmit
Change-Id: Ia7d37ede2276790008702e48fdfaf37f4c1fd251
This commit is contained in:
Nikita Ioffe 2022-10-24 15:31:11 +01:00
parent 882c1681df
commit 75be784fba
2 changed files with 19 additions and 2 deletions

View file

@ -426,8 +426,8 @@ cc_binary {
local_include_dirs: ["include"],
}
cc_binary {
name: "tombstoned",
cc_defaults {
name: "tombstoned_defaults",
srcs: [
"util.cpp",
"tombstoned/intercept_manager.cpp",
@ -446,10 +446,20 @@ cc_binary {
"libevent",
"liblog",
],
}
cc_binary {
name: "tombstoned",
defaults: ["tombstoned_defaults"],
init_rc: ["tombstoned/tombstoned.rc"],
}
cc_binary {
name: "tombstoned.microdroid",
defaults: ["tombstoned_defaults"],
init_rc: ["tombstoned/tombstoned.microdroid.rc"],
}
prebuilt_etc {
name: "crash_dump.policy",
sub_dir: "seccomp_policy",

View file

@ -0,0 +1,7 @@
service tombstoned /system/bin/tombstoned.microdroid
user tombstoned
group system
socket tombstoned_crash seqpacket 0666 system system
socket tombstoned_intercept seqpacket 0666 system system
socket tombstoned_java_trace seqpacket 0666 system system