Mir

Merge lp://qastaging/~vanvugt/mir/remove-binder into lp://qastaging/~mir-team/mir/trunk

remove-binder
Merge into trunk

Proposed by Daniel van Vugt on 2013-03-28

Status:

Merged

Approved by:

Alan Griffiths on 2013-03-28

Approved revision:

no longer in the source branch.

Merged at revision:

544

Proposed branch:

lp://qastaging/~vanvugt/mir/remove-binder

Merge into:

lp://qastaging/~mir-team/mir/trunk

Diff against target:

1093 lines (+0/-922)

19 files modified

3rd_party/android-deps/binder/IBinder.h (+0/-160)
CMakeLists.txt (+0/-7)
examples/CMakeLists.txt (+0/-6)
src/client/CMakeLists.txt (+0/-7)
src/client/make_binder_rpc_channel.cpp (+0/-29)
src/client/mir_binder_rpc_channel.cpp (+0/-139)
src/client/mir_binder_rpc_channel.h (+0/-71)
src/server/frontend/CMakeLists.txt (+0/-17)
src/server/frontend/binder_service.cpp (+0/-153)
src/server/frontend/binder_service.h (+0/-66)
src/server/frontend/make_protobuf_binder_communicator.cpp (+0/-38)
src/server/frontend/protobuf_binder_communicator.cpp (+0/-68)
src/server/frontend/protobuf_binder_communicator.h (+0/-51)
tests/acceptance-tests/CMakeLists.txt (+0/-5)
tests/mir_test_doubles/CMakeLists.txt (+0/-6)
tests/mir_test_doubles/test_protobuf_binder_server.cpp (+0/-37)
tests/mir_test_framework/CMakeLists.txt (+0/-6)
tests/mir_test_framework/binder_detect_server.cpp (+0/-54)
tests/unit-tests/frontend/CMakeLists.txt (+0/-2)

To merge this branch:

bzr merge lp://qastaging/~vanvugt/mir/remove-binder

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Alan Griffiths		2013-03-28	Approve on 2013-03-28
PS Jenkins bot (community)	continuous-integration		Approve on 2013-03-28
Review via email: mp+155918@code.qastaging.launchpad.net