Merge "envsetup.sh: partly fix syswrite" am: fe9de6798b
am: e5ee7281e9
am: d3b66c449c
Original change: https://android-review.googlesource.com/c/platform/build/+/2192201 Change-Id: I0e4d267240ddb3f6f2db1a940f2a264cc3de482b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1069,7 +1069,7 @@ function qpid() {
|
|||||||
# Easy way to make system.img/etc writable
|
# Easy way to make system.img/etc writable
|
||||||
function syswrite() {
|
function syswrite() {
|
||||||
adb wait-for-device && adb root || return 1
|
adb wait-for-device && adb root || return 1
|
||||||
if [[ $(adb disable-verity | grep "reboot") ]]; then
|
if [[ $(adb disable-verity | grep -i "reboot") ]]; then
|
||||||
echo "rebooting"
|
echo "rebooting"
|
||||||
adb reboot && adb wait-for-device && adb root || return 1
|
adb reboot && adb wait-for-device && adb root || return 1
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user