Merge lp:~alan-griffiths/mir/install_on_android into lp:mir

[Alan Griffiths]

tools: The tools/install_on_android.sh needs updating with current binaries

tools: The tools/install_on_android.sh needs updating with current binaries

[Kevin DuBois (kdub)]

lgtm, could avoid some of the ci problems

review: Approve

[Alberto Aguirre (albaguirre)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1848
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2426/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/948
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/948/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/949
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/949/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/288
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/288/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2435
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11677

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2426/rebuild

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/992/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1380
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1357/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/376
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-autolanding/376
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-autolanding/376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/294
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/294/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2438/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11706

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> dpkg: error processing archive /var/cache/apt/archives/lxc-android-config_0.193_all.deb (--unpack):
> unable to make backup link of `./lib/udev/rules.d/70-android.rules' before installing new version: Invalid cross-device link

Is there a problem with mako-0090f741e3d141bc?

Re-approving

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/994/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1390
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1367/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/378
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-autolanding/378
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-autolanding/378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/304
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/304/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2447/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11723

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

lp:1358698

[lp:~alan-griffiths/mir/install_on_android]

1852. By Alexandros Frantzis on 2014-08-21

client: Fix SIGTERM dispatch in our default lifecycle event handler, which
was resulting in clients looping infinitely in exception handlers
(LP: #1353867)

Our default lifecycle event handler used to call raise() to send a TERM
signal to the app when a connection break was detected. However, in a
multi-threaded program raise() sends the signal to the current thread only.
If the signal is blocked in that thread, then the signal is lost.

Depending on thread in which we detected that the connection was lost, the
TERM signal would be dispatched (e.g. in the context of a driver callback
asking for the next buffer) or not (e.g. in the context of our main RPC
threads which block all signals). This MP fixes the issue by explicitly
sending the signal to the process instead of the current thread. This ensures
that it will be dispatched to some thread that doesn't block it.

1853. By Daniel van Vugt on 2014-08-21

DemoRenderer: Don't try to create a texture of width zero. libGL might crash
and definitely won't produce anything useful. This simple regression was
caused by accidentally changing float corner_radius = 0.5f into an int in
revision 1845. (LP: #1358210)

1854. By Daniel van Vugt on 2014-08-21

Remove reference to non-existent empty variable ${PROTO_HDRS}

1855. By Alan Griffiths on 2014-08-21

tools: The tools/install_on_android.sh needs updating with current binaries

=== modified file 'tools/install_on_android.sh'
--- tools/install_on_android.sh	2014-03-06 06:05:17 +0000
+++ tools/install_on_android.sh	2014-08-18 13:44:44 +0000
@@ -26,14 +26,14 @@
     adb wait-for-device
     adb root
     adb wait-for-device
-    adb shell mkdir -p ${RUN_DIR}
+    adb shell mkdir -p ${RUN_DIR}/udev_recordings
 
     for x in bin/mir_acceptance_tests \
              bin/mir_integration_tests \
              bin/mir_unit_tests \
              lib/libmirclient.so.* \
-             lib/libmirprotobuf.so.* \
-             lib/libmirplatform.so \
+             lib/libmircommon.so.* \
+             lib/libmirplatform.so.* \
              lib/libmirplatformgraphics.so \
              lib/libmirclientplatform.so \
              lib/libmirserver.so.*
@@ -41,6 +41,11 @@
         adb push $x ${RUN_DIR}
     done
 
+    for x in bin/udev_recordings/*
+    do 
+        adb push $x ${RUN_DIR}/udev_recordings
+    done
+
     echo "cd ${RUN_DIR};
         export GTEST_OUTPUT=xml:./;
         export LD_LIBRARY_PATH=.;