Merge lp:~kdub/mir/split-android into lp:mir

[Kevin DuBois]

platform: prepare android for independently loaded DisplayPlatform and RenderingPlatform

platform: prepare android for independently loaded DisplayPlatform and RenderingPlatform

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

PASSED: Continuous integration, rev:4086
https://mir-jenkins.ubuntu.com/job/mir-ci/3215/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4326
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4413
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4403
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4403
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4403
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4358
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4358/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4358
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4358/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4358
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4358/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4358
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4358/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4358
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4358/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4358
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4358/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

What just happened? CI passed but Launchpad reports conflicts.

[Chris Halse Rogers (raof)]

Looks sensible to me, modulo the ongoing tension with DisplayPlatform::authentication() in the prerequisite MP.

review: Approve

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

PASSED: Continuous integration, rev:4087
https://mir-jenkins.ubuntu.com/job/mir-ci/3233/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4348
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4435
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4425
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4425
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4425
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4380
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4380/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4380
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4380/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4380
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4380/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4380
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4380/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4380
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4380/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4380
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4380/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:4088
https://mir-jenkins.ubuntu.com/job/mir-ci/3244/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4367
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4454
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4444
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4444
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4444
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4399
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4399/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4399
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4399/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4399
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4399/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4399
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4399/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4399
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4399/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4399
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4399/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Kevin DuBois (kdub)]

prereq needed a build-time fix, ticked back to 'review' pending that landing.

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

FAILED: Continuous integration, rev:4089
https://mir-jenkins.ubuntu.com/job/mir-ci/3256/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4384/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4473
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4463
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4463
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4463
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4416
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4416/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4416
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4416/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4416
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4416/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4416/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4416/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4416
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4416/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4416
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4416/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

^^^
18:57:55 E: Unable to locate package glmark2-data
18:57:55 E: Unable to locate package glmark2-es2-mir
18:57:55 E: Unable to locate package umockdev

Try again

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

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1236/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4393/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1304/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4482
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4472
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4472
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4472
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4425
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4425/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4425
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4425/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4425
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4425/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4425/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4425/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4425
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4425/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4425
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4425/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1239/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4400/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1307/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4489
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4479
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4479
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4479
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4432
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4432/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4432
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4432/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4432
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4432/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4432/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4432/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4432
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4432/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4432
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4432/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

intermittent testflinger failure

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

review: Approve (continuous-integration)

=== modified file 'src/platforms/android/server/platform.cpp'
--- src/platforms/android/server/platform.cpp	2017-03-23 12:57:06 +0000
+++ src/platforms/android/server/platform.cpp	2017-03-27 17:45:39 +0000
@@ -95,23 +95,48 @@
 }
 
 mga::Platform::Platform(
-    std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator,
-    std::shared_ptr<mga::DisplayComponentFactory> const& display_buffer_builder,
-    std::shared_ptr<mg::DisplayReport> const& display_report,
-    std::shared_ptr<mga::NativeWindowReport> const& native_window_report,
-    mga::OverlayOptimization overlay_option,
-    std::shared_ptr<mga::DeviceQuirks> const& quirks) :
-    buffer_allocator(buffer_allocator),
-    display_buffer_builder(display_buffer_builder),
-    display_report(display_report),
-    quirks(quirks),
-    native_window_report(native_window_report),
-    overlay_option(overlay_option)
+    std::shared_ptr<HwcPlatform> const& display,
+    std::shared_ptr<GrallocPlatform> const& rendering) :
+    display(display),
+    rendering(rendering)
 {
 }
 
 mir::UniqueModulePtr<mg::GraphicBufferAllocator> mga::Platform::create_buffer_allocator()
 {
+    return rendering->create_buffer_allocator();
+}
+
+mir::UniqueModulePtr<mg::Display> mga::Platform::create_display(
+    std::shared_ptr<mg::DisplayConfigurationPolicy> const& policy,
+    std::shared_ptr<mg::GLConfig> const& gl_config)
+{
+    return display->create_display(policy, gl_config);
+}
+
+mir::UniqueModulePtr<mg::PlatformIpcOperations> mga::Platform::make_ipc_operations() const
+{
+    return rendering->make_ipc_operations();
+}
+
+mg::NativeRenderingPlatform* mga::Platform::native_rendering_platform()
+{
+    return rendering->native_rendering_platform();
+}
+
+mg::NativeDisplayPlatform* mga::Platform::native_display_platform()
+{
+    return display->native_display_platform();
+}
+
+mga::GrallocPlatform::GrallocPlatform(
+    std::shared_ptr<mg::GraphicBufferAllocator> const& buffer_allocator) :
+    buffer_allocator(buffer_allocator)
+{
+}
+
+mir::UniqueModulePtr<mg::GraphicBufferAllocator> mga::GrallocPlatform::create_buffer_allocator()
+{
     struct WrappingGraphicsBufferAllocator : mg::GraphicBufferAllocator
     {
         WrappingGraphicsBufferAllocator(
@@ -148,35 +173,51 @@
     return make_module_ptr<WrappingGraphicsBufferAllocator>(buffer_allocator);
 }
 
-mir::UniqueModulePtr<mg::Display> mga::Platform::create_display(
-        std::shared_ptr<mg::DisplayConfigurationPolicy> const&,
-        std::shared_ptr<mg::GLConfig> const& gl_config)
+mir::UniqueModulePtr<mg::PlatformIpcOperations> mga::GrallocPlatform::make_ipc_operations() const
+{
+    return mir::make_module_ptr<mga::IpcOperations>();
+}
+
+mg::NativeRenderingPlatform* mga::GrallocPlatform::native_rendering_platform()
+{
+    return this;
+}
+
+EGLNativeDisplayType mga::GrallocPlatform::egl_native_display() const
+{
+    return EGL_DEFAULT_DISPLAY;
+}
+
+mga::HwcPlatform::HwcPlatform(
+    std::shared_ptr<mg::GraphicBufferAllocator> const& buffer_allocator,
+    std::shared_ptr<mga::DisplayComponentFactory> const& display_buffer_builder,
+    std::shared_ptr<mg::DisplayReport> const& display_report,
+    std::shared_ptr<mga::NativeWindowReport> const& native_window_report,
+    mga::OverlayOptimization overlay_option,
+    std::shared_ptr<mga::DeviceQuirks> const& quirks) :
+    buffer_allocator(buffer_allocator),
+    display_buffer_builder(display_buffer_builder),
+    display_report(display_report),
+    quirks(quirks),
+    native_window_report(native_window_report),
+    overlay_option(overlay_option)
+{
+}
+
+mir::UniqueModulePtr<mg::Display> mga::HwcPlatform::create_display(
+    std::shared_ptr<mg::DisplayConfigurationPolicy> const&,
+    std::shared_ptr<mg::GLConfig> const& gl_config)
 {
     auto const program_factory = std::make_shared<mir::gl::DefaultProgramFactory>();
     return mir::make_module_ptr<mga::Display>(
             display_buffer_builder, program_factory, gl_config, display_report, native_window_report, overlay_option);
 }
 
-mg::NativeDisplayPlatform* mga::Platform::native_display_platform()
+mg::NativeDisplayPlatform* mga::HwcPlatform::native_display_platform()
 {
     return nullptr;
 }
 
-mir::UniqueModulePtr<mg::PlatformIpcOperations> mga::Platform::make_ipc_operations() const
-{
-    return mir::make_module_ptr<mga::IpcOperations>();
-}
-
-mg::NativeRenderingPlatform* mga::Platform::native_rendering_platform()
-{
-    return this;
-}
-
-EGLNativeDisplayType mga::Platform::egl_native_display() const
-{
-    return EGL_DEFAULT_DISPLAY;
-}
-
 mir::UniqueModulePtr<mg::Platform> create_host_platform(
     std::shared_ptr<mo::Option> const& options,
     std::shared_ptr<mir::EmergencyCleanupRegistry> const&,
@@ -193,15 +234,19 @@
     auto component_factory = std::make_shared<mga::HalComponentFactory>(
         display_resource_factory, hwc_report, quirks);
 
-    return mir::make_module_ptr<mga::Platform>(
-        component_factory->the_buffer_allocator(),
+    auto allocator = component_factory->the_buffer_allocator();
+    auto display = std::make_shared<mga::HwcPlatform>(
+        allocator,
         component_factory, display_report,
         make_native_window_report(*options, logger),
         overlay_option, quirks);
+
+    return mir::make_module_ptr<mga::Platform>(display,
+         std::make_shared<mga::GrallocPlatform>(allocator));
 }
 
 mir::UniqueModulePtr<mg::Platform> create_guest_platform(
-    std::shared_ptr<mg::DisplayReport> const& display_report,
+    std::shared_ptr<mg::DisplayReport> const&,
     std::shared_ptr<mg::PlatformAuthentication> const&)
 {
     mir::assert_entry_point_signature<mg::CreateGuestPlatform>(&create_guest_platform);
@@ -214,13 +259,52 @@
     else
         sync_factory = std::make_shared<mga::NullCommandStreamSyncFactory>();
 
+    auto const buffer_allocator = std::make_shared<mga::GraphicBufferAllocator>(sync_factory, quirks);
     //TODO: remove nullptr parameter once platform classes are sorted.
-    //      mg::NativeRenderingPlatform cannot create a display anyways, so it doesnt need a  display builder
+    //      a guest platform cannot create a display anyways, so it doesnt need a display builder
+    return mir::make_module_ptr<mga::Platform>(
+        nullptr, std::make_shared<mga::GrallocPlatform>(buffer_allocator));
+}
+
+mir::UniqueModulePtr<mir::graphics::DisplayPlatform> create_display_platform(
+    std::shared_ptr<mir::options::Option> const& options,
+    std::shared_ptr<mir::EmergencyCleanupRegistry> const&,
+    std::shared_ptr<mir::graphics::DisplayReport> const& report,
+    std::shared_ptr<mir::logging::Logger> const& logger)
+{
+    mir::assert_entry_point_signature<mg::CreateDisplayPlatform>(&create_display_platform);
+    auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}, *options);
+    auto hwc_report = make_hwc_report(*options);
+    auto overlay_option = should_use_overlay_optimization(*options);
+    hwc_report->report_overlay_optimization(overlay_option);
+    auto display_resource_factory = std::make_shared<mga::ResourceFactory>();
+
+    auto component_factory = std::make_shared<mga::HalComponentFactory>(
+        display_resource_factory, hwc_report, quirks);
+
+    return mir::make_module_ptr<mga::HwcPlatform>(
+        component_factory->the_buffer_allocator(),
+        component_factory, report,
+        make_native_window_report(*options, logger),
+        overlay_option, quirks);
+}
+
+mir::UniqueModulePtr<mir::graphics::RenderingPlatform> create_rendering_platform(
+    std::shared_ptr<mir::options::Option> const&,
+    std::shared_ptr<mir::graphics::PlatformAuthentication> const&)
+{
+    mir::assert_entry_point_signature<mg::CreateRenderingPlatform>(&create_rendering_platform);
+
+    auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{});
+
+    std::shared_ptr<mga::CommandStreamSyncFactory> sync_factory;
+    if (quirks->working_egl_sync())
+        sync_factory = std::make_shared<mga::EGLSyncFactory>();
+    else
+        sync_factory = std::make_shared<mga::NullCommandStreamSyncFactory>();
+
     auto const buffer_allocator = std::make_shared<mga::GraphicBufferAllocator>(sync_factory, quirks);
-    return mir::make_module_ptr<mga::Platform>(
-        buffer_allocator, nullptr, display_report,
-        std::make_shared<mga::NullNativeWindowReport>(),
-        mga::OverlayOptimization::disabled, quirks);
+    return mir::make_module_ptr<mga::GrallocPlatform>(buffer_allocator);
 }
 
 void add_graphics_platform_options(

=== modified file 'src/platforms/android/server/platform.h'
--- src/platforms/android/server/platform.h	2017-03-23 12:57:06 +0000
+++ src/platforms/android/server/platform.h	2017-03-27 17:45:39 +0000
@@ -38,12 +38,28 @@
 class CommandStreamSyncFactory;
 class NativeWindowReport;
 
-class Platform : public graphics::Platform,
-                 public graphics::NativeRenderingPlatform,
-                 public mir::renderer::gl::EGLPlatform
-{
-public:
-    Platform(
+
+class GrallocPlatform : public graphics::RenderingPlatform,
+                        public graphics::NativeRenderingPlatform,
+                        public renderer::gl::EGLPlatform
+{
+public:
+    GrallocPlatform(
+        std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator);
+
+    UniqueModulePtr<graphics::GraphicBufferAllocator> create_buffer_allocator() override;
+    UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
+    NativeRenderingPlatform* native_rendering_platform() override;
+    EGLNativeDisplayType egl_native_display() const override;
+
+private:
+    std::shared_ptr<graphics::GraphicBufferAllocator> const buffer_allocator;
+};
+
+class HwcPlatform : public graphics::DisplayPlatform
+{
+public:
+    HwcPlatform(
         std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator,
         std::shared_ptr<DisplayComponentFactory> const& display_buffer_builder,
         std::shared_ptr<DisplayReport> const& display_report,
@@ -51,15 +67,10 @@
         OverlayOptimization overlay_option,
         std::shared_ptr<DeviceQuirks> const& quirks);
 
-    /* From Platform */
-    UniqueModulePtr<graphics::GraphicBufferAllocator> create_buffer_allocator() override;
     UniqueModulePtr<Display> create_display(
         std::shared_ptr<graphics::DisplayConfigurationPolicy> const&,
         std::shared_ptr<graphics::GLConfig> const& /*gl_config*/) override;
     NativeDisplayPlatform* native_display_platform() override;
-    UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
-    NativeRenderingPlatform* native_rendering_platform() override;
-    EGLNativeDisplayType egl_native_display() const override;
 
 private:
     std::shared_ptr<graphics::GraphicBufferAllocator> const buffer_allocator;
@@ -68,7 +79,26 @@
     std::shared_ptr<DeviceQuirks> const quirks;
     std::shared_ptr<NativeWindowReport> const native_window_report;
     OverlayOptimization const overlay_option;
-
+};
+
+class Platform : public graphics::Platform
+{
+public:
+    Platform(
+        std::shared_ptr<HwcPlatform> const& display,
+        std::shared_ptr<GrallocPlatform> const& rendering);
+
+    UniqueModulePtr<graphics::GraphicBufferAllocator> create_buffer_allocator() override;
+    UniqueModulePtr<Display> create_display(
+        std::shared_ptr<graphics::DisplayConfigurationPolicy> const&,
+        std::shared_ptr<graphics::GLConfig> const& /*gl_config*/) override;
+    UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
+    NativeRenderingPlatform* native_rendering_platform() override;
+    NativeDisplayPlatform* native_display_platform() override;
+
+private:
+    std::shared_ptr<HwcPlatform> const display;
+    std::shared_ptr<GrallocPlatform> const rendering;
 };
 
 }

=== modified file 'tests/unit-tests/platforms/android/server/test_platform.cpp'
--- tests/unit-tests/platforms/android/server/test_platform.cpp	2017-03-10 14:13:17 +0000
+++ tests/unit-tests/platforms/android/server/test_platform.cpp	2017-03-27 17:45:39 +0000
@@ -116,8 +116,7 @@
     EXPECT_CALL(*native_buffer, copy_fence())
         .WillOnce(Return(fake_fence));
 
-    mga::Platform platform(stub_buffer_allocator, stub_display_builder,
-        stub_display_report, anw_report, mga::OverlayOptimization::enabled, quirks);
+    mga::GrallocPlatform platform(stub_buffer_allocator);
 
     mtd::MockBufferIpcMessage mock_ipc_msg;
     int offset = 0;
@@ -151,8 +150,7 @@
     EXPECT_CALL(*native_buffer, copy_fence())
         .WillOnce(Return(-1));
 
-    mga::Platform platform(stub_buffer_allocator, stub_display_builder,
-        stub_display_report, anw_report, mga::OverlayOptimization::enabled, quirks);
+    mga::GrallocPlatform platform(stub_buffer_allocator);
 
     mtd::MockBufferIpcMessage mock_ipc_msg;
     int offset = 0;
@@ -194,8 +192,7 @@
     EXPECT_CALL(*native_buffer, copy_fence())
         .WillOnce(Return(-1));
 
-    mga::Platform platform(stub_buffer_allocator, stub_display_builder,
-        stub_display_report, anw_report, mga::OverlayOptimization::enabled, quirks);
+    mga::GrallocPlatform platform(stub_buffer_allocator);
 
     mtd::MockBufferIpcMessage mock_ipc_msg;
     int offset = 0;
@@ -232,8 +229,7 @@
     using namespace ::testing;
 
     int fake_fence{33};
-    mga::Platform platform(stub_buffer_allocator, stub_display_builder,
-        stub_display_report, anw_report, mga::OverlayOptimization::enabled, quirks);
+    mga::GrallocPlatform platform(stub_buffer_allocator);
     auto ipc_ops = platform.make_ipc_operations();
 
     mtd::MockBufferIpcMessage mock_ipc_msg;
@@ -259,13 +255,7 @@
 {
     testing::NiceMock<mtd::MockEGL> mock_egl;
     mtd::NullGLContext context;
-    mga::Platform platform(
-        std::make_shared<mtd::StubBufferAllocator>(),
-        std::make_shared<mtd::StubDisplayBuilder>(),
-        mr::null_display_report(),
-        std::make_shared<mga::NullNativeWindowReport>(),
-        mga::OverlayOptimization::enabled,
-        std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}, context));
+    mga::GrallocPlatform platform(std::make_shared<mtd::StubBufferAllocator>());
     EXPECT_EQ(EGL_DEFAULT_DISPLAY, platform.egl_native_display());
 }