Merge lp:~vanvugt/mir/fix-1206369 into lp:~mir-team/mir/trunk

[Daniel van Vugt]

Don't run Android commands which are no longer valid in flipped phablet
images. They will only kill your connection to the device. (LP: #1206369)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:891
http://jenkins.qa.ubuntu.com/job/mir-ci/1125/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1472
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1357
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/363
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/363/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/731

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1125/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Alan Griffiths (alan-griffiths)]

yep

review: Approve

=== modified file 'tools/install_on_android.sh'
--- tools/install_on_android.sh	2013-04-24 05:22:20 +0000
+++ tools/install_on_android.sh	2013-07-30 07:11:27 +0000
@@ -26,7 +26,6 @@
     adb wait-for-device
     adb root
     adb wait-for-device
-    adb shell stop
     adb shell mkdir -p ${RUN_DIR}
 
     for x in bin/acceptance-tests \
@@ -39,8 +38,7 @@
         adb push $x ${RUN_DIR}
     done
 
-    echo "ubuntu_chroot shell;
-        cd ${RUN_DIR};
+    echo "cd ${RUN_DIR};
         export GTEST_OUTPUT=xml:./;
         export LD_LIBRARY_PATH=.;
         ./unit-tests;