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

[Daniel van Vugt]

setup-android-dependencies.sh: Don't prompt for confirmation when running a
script in adb shell. It doesn't receive keystrokes so will hang forever.
(LP: #1191636)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:746
http://jenkins.qa.ubuntu.com/job/mir-ci/743/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/926
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/808
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/228
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/228/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

=== modified file 'tools/setup-android-dependencies.sh'
--- tools/setup-android-dependencies.sh	2013-06-14 07:12:05 +0000
+++ tools/setup-android-dependencies.sh	2013-06-17 03:19:27 +0000
@@ -21,11 +21,11 @@
     echo "ubuntu_chroot shell;
         cd /root;
         dpkg -i libgflags2_2.0-1_armhf.deb libgoogle-glog0_0.3.2-4ubuntu1_armhf.deb
-        apt-get install libprotobuf7 \
-                        libboost-system1.49.0 \
-                        libboost-program-options1.49.0 \
-                        libboost-thread1.49.0 \
-                        libxkbcommon0
+        apt-get -y install libprotobuf7 \
+                           libboost-system1.49.0 \
+                           libboost-program-options1.49.0 \
+                           libboost-thread1.49.0 \
+                           libxkbcommon0
 
             exit;
             exit" | adb shell