Merge lp://qastaging/~vanvugt/mir/fix-1539338 into lp://qastaging/mir
| Status: | Merged |
|---|---|
| Approved by: | Alan Griffiths |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 3280 |
| Proposed branch: | lp://qastaging/~vanvugt/mir/fix-1539338 |
| Merge into: | lp://qastaging/mir |
| Diff against target: |
24 lines (+2/-2) 2 files modified
cmake/FindLibHardware.cmake (+1/-1) src/platforms/android/common/syncfence.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~vanvugt/mir/fix-1539338 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kevin DuBois (community) | Approve | ||
| Alan Griffiths | Approve | ||
| Andreas Pokorny (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Mir CI Bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
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/
to:
/usr/
leaving the former empty. And to use the latter you have to request a
different pkgconfig module (which we do here).
Description of the change
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) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
PASSED: Continuous integration, rev:3276
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/