Merge lp://staging/~raof/mir/implement-preserve-framebuffers-for-android into lp://staging/mir
Proposed by
Chris Halse Rogers
Status: | Merged |
---|---|
Approved by: | Chris Halse Rogers |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3806 |
Proposed branch: | lp://staging/~raof/mir/implement-preserve-framebuffers-for-android |
Merge into: | lp://staging/mir |
Diff against target: |
385 lines (+140/-57) 16 files modified
include/platform/mir/graphics/display.h (+1/-1) include/test/mir/test/doubles/null_display.h (+1/-1) src/platform/graphics/CMakeLists.txt (+1/-0) src/platforms/android/server/display.cpp (+68/-43) src/platforms/android/server/display.h (+4/-1) src/platforms/eglstream-kms/server/display.cpp (+1/-1) src/platforms/eglstream-kms/server/display.h (+1/-1) src/platforms/mesa/server/kms/display.cpp (+1/-1) src/platforms/mesa/server/kms/display.h (+1/-1) src/platforms/mesa/server/x11/graphics/display.cpp (+1/-1) src/platforms/mesa/server/x11/graphics/display.h (+1/-1) src/server/graphics/nested/display.cpp (+1/-1) src/server/graphics/nested/display.h (+1/-1) tests/include/mir/test/doubles/mock_display.h (+1/-2) tests/mir_test_framework/stubbed_graphics_platform.cpp (+1/-1) tests/unit-tests/platforms/android/server/test_display.cpp (+55/-0) |
To merge this branch: | bzr merge lp://staging/~raof/mir/implement-preserve-framebuffers-for-android |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Approve | |
Kevin DuBois (community) | Approve | ||
Andreas Pokorny (community) | Approve | ||
Review via email: mp+309902@code.staging.launchpad.net |
Commit message
Implement Display:
To post a comment you must log in.
PASSED: Continuous integration, rev:3802 /mir-jenkins. ubuntu. com/job/ mir-ci/ 2100/ /mir-jenkins. ubuntu. com/job/ build-mir/ 2700 /mir-jenkins. ubuntu. com/job/ build-0- fetch/2763 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 2755 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 2755 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= yakkety/ 2755 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= yakkety/ 2729 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= yakkety/ 2729/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 2729 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 2729/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= yakkety/ 2729 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= yakkety/ 2729/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 2729 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 2729/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 2729 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 2729/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 2729 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 2729/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 2100/rebuild
https:/