Merge lp:~vanvugt/mir/fix-1539338 into lp:mir

[Daniel van Vugt]

Workaround/fix broken xenial build, due to last night's changes to the
android-headers packages. (LP: #1539338)

They moved all the Android headers we love from:
   /usr/include/android/
to:
   /usr/include/android-19/
leaving the former empty. And to use the latter you have to request a
different pkgconfig module (which we do here).

I have tried to make this change theoretically compatible with wily and vivid. Although that's not yet true, due to:
  * Our cross-compile scripts seem to prefer the host headers over the chroot headers; and
  * New identifiers recently added in libinput that we use, but don't exist on wily.

So compilation on wily/vivid support will be fixed later, but is not made any worse by this branch :)

This branch is also designed to be safe to keep even if the android-headers in Ubuntu archive gets reverted or fixed.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3276
https://mir-jenkins.ubuntu.com/job/mir-ci/185/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/185/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/185/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3276
http://jenkins.qa.ubuntu.com/job/mir-ci/6159/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5733
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4640
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5689
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/359
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/483
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/483/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/483
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/483/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5686
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5686/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8113
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/355
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/355/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/211
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27162

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

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

lgtm

review: Approve

[Alan Griffiths (alan-griffiths)]

Harmless

review: Approve

[Kevin DuBois (kdub)]

immediate problem fixed, perhaps, but still some deeper digging needed into our dependencies to sort this out generically.

review: Approve

=== modified file 'cmake/FindLibHardware.cmake'
--- cmake/FindLibHardware.cmake	2014-03-06 06:05:17 +0000
+++ cmake/FindLibHardware.cmake	2016-01-29 04:09:27 +0000
@@ -7,7 +7,7 @@
 INCLUDE(FindPackageHandleStandardArgs)
 
 find_package( PkgConfig )
-pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
+pkg_search_module(ANDROID_HEADERS REQUIRED android-headers-19 android-headers)
 set(LIBHARDWARE_INCLUDE_DIRS ${ANDROID_HEADERS_INCLUDE_DIRS})
 
 find_library(LIBHARDWARE_LIBRARY

=== modified file 'src/platforms/android/common/syncfence.cpp'
--- src/platforms/android/common/syncfence.cpp	2016-01-20 23:59:18 +0000
+++ src/platforms/android/common/syncfence.cpp	2016-01-29 04:09:27 +0000
@@ -20,7 +20,7 @@
 
 #include <unistd.h>
 #include <sys/ioctl.h>
-#include <android/linux/sync.h>
+#include <linux/sync.h>  // This will come from /usr/include/android{,-19}/
 
 namespace mga = mir::graphics::android;