summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Potapenko <glider@google.com>2021-12-21 23:41:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-21 23:41:13 +0000
commite9a69d32676018d9cd93b91d4a43597d9e607279 (patch)
treeb18ab7314d065a7e2823c81c154d35716ce85145
parent3329eabb59da1644bfd6429c730c2b4eef5b5922 (diff)
parentc81fec7d8eda91bdbbed87606bd3c844b5605214 (diff)
downloadcore-e9a69d32676018d9cd93b91d4a43597d9e607279.tar.gz
Restrict creation of bootreceiver tracing instance to 64-bit systems. am: c81fec7d8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15981480 Change-Id: Iae0eaa865440448cf08eb54d720b2e2702da2279
-rw-r--r--rootdir/init.rc3
1 files changed, 2 insertions, 1 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 376a678a8..d10689a01 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -590,9 +590,10 @@ on late-fs
# Load trusted keys from dm-verity protected partitions
exec -- /system/bin/fsverity_init --load-verified-keys
+on late-fs && property:ro.product.cpu.abilist64=*
# Set up a tracing instance for system_server to monitor error_report_end events.
# These are sent by kernel tools like KASAN and KFENCE when a memory corruption
- # is detected.
+ # is detected. This is only needed for 64-bit systems.
mkdir /sys/kernel/tracing/instances/bootreceiver 0700 system system
restorecon_recursive /sys/kernel/tracing/instances/bootreceiver
write /sys/kernel/tracing/instances/bootreceiver/buffer_size_kb 1