summaryrefslogtreecommitdiffstats
path: root/envsetup.sh
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-04-13 13:23:35 -0700
committerAdnan Begovic <adnan@cyngn.com>2015-10-06 16:12:12 -0700
commit21e4f7fdb1372254c4c89b1cc33ef70934cefe9e (patch)
tree1cc1b1180380f7a29a8597638cd2bea082cc1799 /envsetup.sh
parent464574f63ebc1b88100b4b98fb4aadc3734383c2 (diff)
downloadbuild-21e4f7fdb1372254c4c89b1cc33ef70934cefe9e.zip
build-21e4f7fdb1372254c4c89b1cc33ef70934cefe9e.tar.gz
build-21e4f7fdb1372254c4c89b1cc33ef70934cefe9e.tar.bz2
envsetup: Make installboot work in recovery mode too
* Needs a change to adb to allow waiting for recovery Change-Id: Ia90645513f46bcb5f20b7c74c55ef15842710d3d
Diffstat (limited to 'envsetup.sh')
-rw-r--r--envsetup.sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/envsetup.sh b/envsetup.sh
index 01b657c..49018a0 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1610,9 +1610,8 @@ function installboot()
adb start-server
adb root
sleep 1
- adb wait-for-device
- adb remount
- adb wait-for-device
+ adb wait-for-online shell mount /system 2>&1 > /dev/null
+ adb wait-for-online remount
if (adb shell cat /system/build.prop | grep -q "ro.cm.device=$CM_BUILD");
then
adb push $OUT/boot.img /cache/
@@ -1649,9 +1648,8 @@ function installrecovery()
adb start-server
adb root
sleep 1
- adb wait-for-device
- adb remount
- adb wait-for-device
+ adb wait-for-online shell mount /system 2>&1 >> /dev/null
+ adb wait-for-online remount
if (adb shell cat /system/build.prop | grep -q "ro.cm.device=$CM_BUILD");
then
adb push $OUT/recovery.img /cache/