From a2b67d6063e5c46f5dbd446deed553278a6cf0b3 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 19 Apr 2017 18:17:18 -0700 Subject: [PATCH] Asan_extract: Use sys.powerctl rc-style powerctl has beem removed. Accordingly, asan_extract now needs to access sys.powerctl directly. Bug: 36458146 Test: m && m SANITIZE_TARGET=address SANITIZE_TARGET_SYSTEM=true Change-Id: Ic65a858962b4b3dd613fdbfa09f93d21425bf892 --- rootdir/asan_extract.rc | 3 --- rootdir/asan_extract.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/rootdir/asan_extract.rc b/rootdir/asan_extract.rc index 705d8722c..4aea6a374 100644 --- a/rootdir/asan_extract.rc +++ b/rootdir/asan_extract.rc @@ -1,6 +1,3 @@ # When /data is available, look for /system/asan.tar.gz and potentially extract. on post-fs-data exec - system system -- /system/bin/asan_extract - -on early-boot && property:asan.restore_reboot=1 - powerctl reboot diff --git a/rootdir/asan_extract.sh b/rootdir/asan_extract.sh index 8d626b32a..2d723207b 100644 --- a/rootdir/asan_extract.sh +++ b/rootdir/asan_extract.sh @@ -92,4 +92,4 @@ echo "$ASAN_TAR_MD5" > $MD5_FILE log -p i -t asan_install "Signaling init to reboot..." -setprop asan.restore_reboot 1 +setprop sys.powerctl reboot