Mir

Merge lp://qastaging/~alan-griffiths/mir/fix-1483223 into lp://qastaging/mir

fix-1483223
Merge into development-branch

Proposed by Alan Griffiths on 2015-08-11

Status:	Work in progress
Proposed branch:	lp://qastaging/~alan-griffiths/mir/fix-1483223
Merge into:	lp://qastaging/mir
Prerequisite:	lp://qastaging/~alan-griffiths/mir/prerequsites-for-fixing-1483223
Diff against target:	5491 lines (+52/-5300) 14 files modified 3rd_party/android-input/android/CMakeLists.txt (+9/-31) 3rd_party/android-input/android/frameworks/base/services/input/InputApplication.cpp (+0/-42) 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp (+0/-4312) 3rd_party/android-input/android/frameworks/base/services/input/InputWindow.cpp (+0/-65) 3rd_party/android-input/android/frameworks/base/services/input/PointerController.cpp (+0/-276) 3rd_party/android-input/android/frameworks/native/libs/utils/Looper.cpp (+0/-561) benchmarks/android-input/CMakeLists.txt (+0/-1) src/client/CMakeLists.txt (+11/-2) src/client/input/CMakeLists.txt (+0/-5) src/client/symbols.map (+31/-1) src/server/CMakeLists.txt (+0/-1) src/utils/CMakeLists.txt (+1/-1) tests/integration-tests/CMakeLists.txt (+0/-1) tests/unit-tests/CMakeLists.txt (+0/-1)
To merge this branch:	bzr merge lp://qastaging/~alan-griffiths/mir/fix-1483223
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel van Vugt		2015-08-11	Needs Information on 2015-08-12
PS Jenkins bot (community)	continuous-integration		Approve on 2015-08-11
Review via email: mp+267664@code.qastaging.launchpad.net

Commit message

Put the former android-input-static library into mirclient (instead of linking it into both mirclient and mirserver).

Description of the change

Put the former android-input-static library into mirclient (instead of linking it into both mirclient and mirserver).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-11:

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~alan-griffiths/mir/fix-1483223 updated on 2015-08-11

2838. By Alan Griffiths on 2015-08-11: Remove parts of android input not used by libmirclient (or libmirserver)
2839. By Alan Griffiths on 2015-08-11: merge lp:mir

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-08-11:

I'm a little puzzled how things ever worked.

All the android-input stuff that remains here is (at least transitively) used in mirclient.

But that includes use of udev code that lives in mirplatform (until lp:~alan-griffiths/mir/prerequsites-for-fixing-1483223)

So how did clients ever link?

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-08-11:

OTOH this series does pull more stuff into libmirclient, so I've got something wrong in the above reasoning.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-11:

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

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-08-12:

Wow, 5k lines of diff by removing dead code!?

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-08-12:

The best news is input-reader-perf.bin is 10MB smaller.

And libmirserver is 6MB smaller, but libmircommon+libmirclient are now bigger to compensate. So the overall gain is almost negligible.

(1) Shouldn't MIR_CLIENT_DETAIL_9 become MIR_CLIENT_DETAIL_9.1 for new functions? Even as an internal ABI I feel we should probably manage it like the others.

(2) Doesn't putting the input code into libmircommon make more sense than libmirclient? I gather that would require moving some exception code mentioned in the bug. But it feels like we're using libmirclient as a helper library for libmirserver, which seems ugly. This isn't a new problem; libmirserver is already linking to libmirclient to support nesting (I assume), but I thought that was something we'd like to move away from eventually.

review: Needs Information

Unmerged revisions

2839. By Alan Griffiths on 2015-08-11: merge lp:mir
2838. By Alan Griffiths on 2015-08-11: Remove parts of android input not used by libmirclient (or libmirserver)
2837. By Alan Griffiths on 2015-08-11: merge lp:mir
2836. By Alan Griffiths on 2015-08-11: Move android-input-static to mirclient
2835. By Alan Griffiths on 2015-08-11: Revert libmirserver soname bump
2834. By Alan Griffiths on 2015-08-11: Fix thinko (we're still on 0.16)
2833. By Alan Griffiths on 2015-08-10: mirserver ABI break - bump the soname
2832. By Alan Griffiths on 2015-08-10: mirserver ABI break - bump the soname
2831. By Alan Griffiths on 2015-08-10: Fix symbol versioning in mircommon
2830. By Alan Griffiths on 2015-08-10: Move mir::udev to common