Merge "envsetup: syswrite - wait after rooting" am: 60588af876
Original change: https://android-review.googlesource.com/c/platform/build/+/2540971 Change-Id: I99d1952212d517b7f462f0175dfa7ed84b0f9a93 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
e204a5cbf6
1 changed files with 3 additions and 3 deletions
|
@ -1096,12 +1096,12 @@ function qpid() {
|
|||
#
|
||||
# Easy way to make system.img/etc writable
|
||||
function syswrite() {
|
||||
adb wait-for-device && adb root || return 1
|
||||
adb wait-for-device && adb root && adb wait-for-device || return 1
|
||||
if [[ $(adb disable-verity | grep -i "reboot") ]]; then
|
||||
echo "rebooting"
|
||||
adb reboot && adb wait-for-device && adb root || return 1
|
||||
adb reboot && adb wait-for-device && adb root && adb wait-for-device || return 1
|
||||
fi
|
||||
adb wait-for-device && adb remount || return 1
|
||||
adb remount || return 1
|
||||
}
|
||||
|
||||
# coredump_setup - enable core dumps globally for any process
|
||||
|
|
Loading…
Reference in a new issue