Merge lp:~raof/mir/proper-driver-loading into lp:mir

[Chris Halse Rogers]

Move the platform plugins into a private directory

We now probe all the DSOs in the driver directory and load the appropriate one, with the appropriate version.
DSO filenames are irrelevant, so everything is now parallel installable.

This is basically a resubmit of https://code.launchpad.net/~raof/mir/privatise-all-the-things/+merge/234063

I *had* hoped to additionally break it out into chunks, but LP seems to be super-confused.

The three MPs
https://code.launchpad.net/~raof/mir/client-driver-probing/+merge/242865
https://code.launchpad.net/~raof/mir/server-side-platform-probing/+merge/243005
https://code.launchpad.net/~raof/mir/plugin-probe-packaging/+merge/243006
should be stacked one on top of the other, if you'd like to review incrementalish bits (although they're not individually landable).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2104
http://jenkins.qa.ubuntu.com/job/mir-ci/2280/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/375/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/375/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/349/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/269/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/349/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

2104. By Chris Halse Rogers on 2014-11-27

Packaging for probable client/server platform plugins

2103. By Chris Halse Rogers on 2014-11-27

Oops. Add a whole bunch of accidentally missing files

2102. By Chris Halse Rogers on 2014-11-27

Move dummy modules alongside their regular counterparts

2101. By Chris Halse Rogers on 2014-11-27

Implement server-side graphics platform probe

=== modified file 'benchmarks/frame-uniformity/CMakeLists.txt'
--- benchmarks/frame-uniformity/CMakeLists.txt	2014-11-20 09:53:04 +0000
+++ benchmarks/frame-uniformity/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -24,15 +24,16 @@
 target_link_libraries(frame_uniformity_test_client
   mirserver
   mirclient
+  mirplatform
   
   mir-test
   mir-test-framework
   mir-test-doubles
   mir-test-doubles-platform
 
+
   # Why does this have to come after mir-test-framework here but not in tests/acceptance-tests/
   # /CMakeLists.txt? ~racarr
-  mirplatform
 
   3rd_party
   ${PROTOBUF_LIBRARIES}

=== modified file 'debian/control'
--- debian/control	2014-11-27 03:48:20 +0000
+++ debian/control	2014-11-27 07:32:44 +0000
@@ -67,7 +67,11 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+<<<<<<< TREE
          libmir${platform-driver}-mesa | libmir${platform-driver}-android,
+=======
+         mir-platform-graphics-mesa | mir-platform-graphics-android,
+>>>>>>> MERGE-SOURCE
 Description: Display server for Ubuntu - server library
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -144,7 +148,11 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+<<<<<<< TREE
          libmir${client-driver}-mesa | libmir${client-driver}-android,
+=======
+         mir-client-platform-mesa | mir-client-platform-android,
+>>>>>>> MERGE-SOURCE
 Description: Display server for Ubuntu - client library
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -266,7 +274,35 @@
  Contains the shared libraries required for the Mir server and client.
 
 # Longer-term these drivers should move out-of-tree
-Package: libmirclient8driver-mesa
+Package: mir-platform-graphics-mesa
+Section: libs
+Architecture: i386 amd64 armhf arm64
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Display server for Ubuntu - platform library for Mesa
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir server to interact with
+ the hardware platform using the Mesa drivers.
+
+Package: mir-platform-graphics-android
+Section: libs
+Architecture: i386 amd64 armhf
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Display server for Ubuntu - platform library for Android
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir server to interact with
+ the hardware platform using the Android drivers.
+
+Package: mir-client-platform-mesa
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -280,7 +316,7 @@
  Contains the shared libraries required for the Mir clients to interact with
  the underlying hardware platform using the Mesa drivers.
 
-Package: libmirclient8driver-android
+Package: mir-client-platform-android
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
@@ -294,42 +330,19 @@
  Contains the shared libraries required for the Mir clients to interact with
  the underlying hardware platform using the Android drivers.
 
-Package: libmirplatform4driver-mesa
-Section: libs
-Architecture: i386 amd64 armhf arm64
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Display server for Ubuntu - platform library for Mesa
- Mir is a display server running on linux systems, with a focus on efficiency,
- robust operation and a well-defined driver model.
- .
- Contains the shared libraries required for the Mir server to interact with
- the hardware platform using the Mesa drivers.
-
-Package: libmirplatform4driver-android
-Section: libs
-Architecture: i386 amd64 armhf
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Display server for Ubuntu - platform library for Android
- Mir is a display server running on linux systems, with a focus on efficiency,
- robust operation and a well-defined driver model.
- .
- Contains the shared libraries required for the Mir server to interact with
- the hardware platform using the Android drivers.
-
 Package: mir-graphics-drivers-desktop
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
+<<<<<<< TREE
          libmir${platform-driver}-mesa,
          libmir${client-driver}-mesa
+=======
+	 mir-platform-graphics-mesa,
+	 mir-client-platform-mesa,
+>>>>>>> MERGE-SOURCE
 Description: Display server for Ubuntu - desktop driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -343,8 +356,13 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
+<<<<<<< TREE
          libmir${platform-driver}-android,
          libmir${client-driver}-android
+=======
+	 mir-platform-graphics-android,
+	 mir-client-platform-android,
+>>>>>>> MERGE-SOURCE
 Description: Display server for Ubuntu - android driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.

=== renamed file 'debian/libmirclient8driver-android.install' => 'debian/mir-client-platform-android.install'
--- debian/libmirclient8driver-android.install	2014-11-24 02:16:00 +0000
+++ debian/mir-client-platform-android.install	2014-11-27 07:32:44 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/client*driver/android/*
+usr/lib/*/mir/client-platform/android.so

=== renamed file 'debian/libmirclient8driver-mesa.install' => 'debian/mir-client-platform-mesa.install'
--- debian/libmirclient8driver-mesa.install	2014-11-24 02:16:00 +0000
+++ debian/mir-client-platform-mesa.install	2014-11-27 07:32:44 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/client*driver/mesa/*
+usr/lib/*/mir/client-platform/mesa.so

=== renamed file 'debian/libmirplatform4driver-android.install' => 'debian/mir-platform-graphics-android.install'
--- debian/libmirplatform4driver-android.install	2014-11-24 02:16:00 +0000
+++ debian/mir-platform-graphics-android.install	2014-11-27 07:32:44 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/platform*driver/android/*
+usr/lib/*/mir/server-platform/graphics-android.so

=== renamed file 'debian/libmirplatform4driver-mesa.install' => 'debian/mir-platform-graphics-mesa.install'
--- debian/libmirplatform4driver-mesa.install	2014-11-24 02:16:00 +0000
+++ debian/mir-platform-graphics-mesa.install	2014-11-27 07:32:44 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/platform*driver/mesa/*
+usr/lib/*/mir/server-platform/graphics-mesa.so

=== modified file 'debian/mir-test-tools.install'
--- debian/mir-test-tools.install	2014-11-24 02:16:00 +0000
+++ debian/mir-test-tools.install	2014-11-27 07:32:44 +0000
@@ -5,4 +5,5 @@
 usr/bin/mir_performance_tests
 usr/lib/*/mir/tools/libmirclientlttng.so
 usr/lib/*/mir/tools/libmirserverlttng.so
-usr/lib/*/libmirplatformstub.so
+usr/lib/*/mir/client-platform/dummy.so
+usr/lib/*/mir/server-platform/graphics-dummy.so

=== modified file 'debian/rules'
--- debian/rules	2014-11-27 03:48:20 +0000
+++ debian/rules	2014-11-27 07:32:44 +0000
@@ -13,9 +13,6 @@
 export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
 export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
 
-export PLATFORM_DRIVER = platform4driver
-export CLIENT_DRIVER = client8driver
-
 %:
 	dh $@ --parallel --fail-missing
 
@@ -57,6 +54,7 @@
 # Nothing outside Mir should link to libmirprotobuf directly.
 # Delete the symlink so that --fail-missing doesn't think we've missed it
 # accidentally.
+<<<<<<< TREE
 	rm debian/tmp/usr/lib/*/libmirprotobuf.so
 	dh_install --fail-missing \
 	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmir$(PLATFORM_DRIVER).so \
@@ -72,3 +70,7 @@
 	dh_gencontrol -- \
 		-Vplatform-driver=$(PLATFORM_DRIVER) \
 		-Vclient-driver=$(CLIENT_DRIVER)
+=======
+	-rm debian/tmp/usr/lib/*/libmirprotobuf.so
+	dh_install --fail-missing
+>>>>>>> MERGE-SOURCE

=== modified file 'include/platform/mir/graphics/platform.h'
--- include/platform/mir/graphics/platform.h	2014-11-27 03:48:20 +0000
+++ include/platform/mir/graphics/platform.h	2014-11-27 07:32:44 +0000
@@ -96,6 +96,33 @@
 };
 
 /**
+ * A measure of how good this module is at supporting the current device
+ *
+ * \note This is compared as an integer; best + 1 is a valid PlatformPriority that
+ *       will be used in preference to a module that reports best.
+ *       Platform modules distributed with Mir will never use a priority higher
+ *       than best.
+ */
+enum PlatformPriority : uint32_t
+{
+    unsupported = 0,    /**< Unable to function at all on this device */
+    supported = 128,    /**< Capable of providing a functioning Platform on this device,
+                         *   possibly with degraded performance or features.
+                         */
+    best = 256          /**< Capable of providing a Platform with the best features and
+                         *   performance this device is capable of.
+                         */
+};
+
+/**
+ * Describes a platform module
+ */
+struct ModuleProperties
+{
+    char const* name;
+};
+
+/**
  * Function prototype used to return a new graphics platform.
  *
  * \param [in] options options to use for this platform
@@ -118,6 +145,15 @@
     boost::program_options::options_description& config);
 extern "C" void add_platform_options(
     boost::program_options::options_description& config);
+
+// TODO: We actually need to be more granular here; on a device with more
+//       than one graphics system we may need a different platform per GPU,
+//       so we should be associating platforms with graphics devices in some way
+extern "C" typedef PlatformPriority(*PlatformProbe)();
+extern "C" PlatformPriority probe_platform();
+
+extern "C" typedef ModuleProperties const*(*DescribeModule)();
+extern "C" ModuleProperties const* describe_module();
 }
 }
 

=== modified file 'include/platform/mir/options/configuration.h'
--- include/platform/mir/options/configuration.h	2014-11-24 02:16:00 +0000
+++ include/platform/mir/options/configuration.h	2014-11-27 07:32:44 +0000
@@ -54,6 +54,7 @@
 extern char const* const lttng_opt_value;
 
 extern char const* const platform_graphics_lib;
+extern char const* const platform_graphics_path;
 
 class Configuration
 {

=== modified file 'platform-ABI-sha1sums'
--- platform-ABI-sha1sums	2014-11-27 03:48:20 +0000
+++ platform-ABI-sha1sums	2014-11-27 07:32:44 +0000
@@ -37,12 +37,19 @@
 5dc095474ef3e294c0aa4008e9ed997bdb21d34c  include/platform/mir/graphics/gl_config.h
 d0442a5d5d88a4be6e3e1f99e433c1c43a86bfce  include/platform/mir/graphics/gl_context.h
 979d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
+<<<<<<< TREE
 9bbe7eef3a470d7c2daf74de2943a2d03f80aa20  include/platform/mir/graphics/native_platform.h
 3bd5f663b62fd1e4be92518a27ed5a0f6a82f20b  include/platform/mir/graphics/platform.h
+=======
+f90a35371e236a6cfec8e9a8474dbb3305c7621e  include/platform/mir/graphics/internal_client.h
+c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
+c187e4d1ca333ded84d4599c6527b13a658dd77a  include/platform/mir/graphics/native_platform.h
+3a859b3d78822d95910a3053684ab3948af176b6  include/platform/mir/graphics/platform.h
+>>>>>>> MERGE-SOURCE
 3b3463d2513f4c3985f2400496dab333518f9a13  include/platform/mir/graphics/platform_ipc_operations.h
 1b77fb3290af00dc7d1c11dcc5388972dacb9ec3  include/platform/mir/graphics/platform_ipc_package.h
 84c063346b3bd51b4624d9f940008d4c3f8be066  include/platform/mir/graphics/renderable.h
-abeb45a8c6bfc81a12136f25e455e9803c32c10e  include/platform/mir/options/configuration.h
+93a154564a8b25a36c91492b6dc3d8663604ad06  include/platform/mir/options/configuration.h
 47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
 b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
 3c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h

=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums	2014-11-27 03:48:20 +0000
+++ server-ABI-sha1sums	2014-11-27 07:32:44 +0000
@@ -37,12 +37,19 @@
 5dc095474ef3e294c0aa4008e9ed997bdb21d34c  include/platform/mir/graphics/gl_config.h
 d0442a5d5d88a4be6e3e1f99e433c1c43a86bfce  include/platform/mir/graphics/gl_context.h
 979d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
+<<<<<<< TREE
 9bbe7eef3a470d7c2daf74de2943a2d03f80aa20  include/platform/mir/graphics/native_platform.h
 3bd5f663b62fd1e4be92518a27ed5a0f6a82f20b  include/platform/mir/graphics/platform.h
+=======
+f90a35371e236a6cfec8e9a8474dbb3305c7621e  include/platform/mir/graphics/internal_client.h
+c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
+c187e4d1ca333ded84d4599c6527b13a658dd77a  include/platform/mir/graphics/native_platform.h
+3a859b3d78822d95910a3053684ab3948af176b6  include/platform/mir/graphics/platform.h
+>>>>>>> MERGE-SOURCE
 3b3463d2513f4c3985f2400496dab333518f9a13  include/platform/mir/graphics/platform_ipc_operations.h
 1b77fb3290af00dc7d1c11dcc5388972dacb9ec3  include/platform/mir/graphics/platform_ipc_package.h
 84c063346b3bd51b4624d9f940008d4c3f8be066  include/platform/mir/graphics/renderable.h
-abeb45a8c6bfc81a12136f25e455e9803c32c10e  include/platform/mir/options/configuration.h
+93a154564a8b25a36c91492b6dc3d8663604ad06  include/platform/mir/options/configuration.h
 47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
 b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
 3c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-11-24 02:16:00 +0000
+++ src/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -20,3 +20,5 @@
 set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
 set(MIR_COMMON_OBJECTS ${MIR_COMMON_OBJECTS} PARENT_SCOPE)
 set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
+set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)
+set(MIR_SERVER_PLATFORM_PLUGIN_PATH ${MIR_SERVER_PLATFORM_PLUGIN_PATH} PARENT_SCOPE)

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2014-11-27 03:48:20 +0000
+++ src/client/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -1,13 +1,3 @@
-set(MIRCLIENT_ABI 8)
-set(CLIENT_DRIVER client${MIRCLIENT_ABI}driver)
-set(MIR_CLIENT_DRIVER mir${CLIENT_DRIVER})
-set(MIR_CLIENT_DRIVER_BINARY lib${MIR_CLIENT_DRIVER}.so
-    CACHE STRING "File name of Mir client drivers")
-add_definitions(
-  -DMIR_CLIENT_DRIVER_BINARY="${MIR_CLIENT_DRIVER_BINARY}"
-  -DMIR_LOGGING_COMPONENT_FALLBACK="mirclient"
-)
-
 set(PREFIX "${CMAKE_INSTALL_PREFIX}")
 set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
 set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
@@ -33,6 +23,19 @@
   ${DRM_INCLUDE_DIRS}
 )
 
+set(MIRCLIENT_ABI 8)
+set(CLIENT_PLATFORM_VERSION "MIR_CLIENT_PLATFORM_2")
+set(symbol_map ${CMAKE_SOURCE_DIR}/src/client/symbols.map)
+
+set(MIR_CLIENT_PLATFORM_PATH
+  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mir/client-platform
+)
+set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)
+
+add_definitions(-DMIR_CLIENT_PLATFORM_PATH="${MIR_CLIENT_PLATFORM_PATH}/")
+add_definitions(-DCLIENT_PLATFORM_VERSION="${CLIENT_PLATFORM_VERSION}")
+add_definitions(-DMIR_LOGGING_COMPONENT_FALLBACK="mirclient")
+
 add_subdirectory(rpc/)
 add_subdirectory(lttng/)
 
@@ -72,6 +75,7 @@
   mir_prompt_session.cpp
   mir_prompt_session_api.cpp
   mir_event_distributor.cpp
+  probing_client_platform_factory.cpp
   periodic_perf_report.cpp
 )
 
@@ -81,8 +85,6 @@
   $<TARGET_OBJECTS:mirclientobjects>
 )
 
-set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
-
 set_target_properties(
   mirclient
 
@@ -91,7 +93,9 @@
   LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
 )
 
-target_link_libraries(mirclient
+target_link_libraries(
+  mirclient
+
   mirclientrpc
   mirclientlttngstatic
   mircommon

=== modified file 'src/client/android/CMakeLists.txt'
--- src/client/android/CMakeLists.txt	2014-11-24 02:16:00 +0000
+++ src/client/android/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -14,17 +14,18 @@
 )
 
 add_library(
-  mirclientplatformandroid SHARED
-  
+  mirclientplatformandroid MODULE
+
   $<TARGET_OBJECTS:mirclientplatformandroidobjects>
   $<TARGET_OBJECTS:mirclient_platformimpl>
 )
 
 set_target_properties(
   mirclientplatformandroid PROPERTIES
-  OUTPUT_NAME ${MIR_CLIENT_DRIVER}
-  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/android
-  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
+  OUTPUT_NAME android
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/client-modules
+  PREFIX ""
+  LINK_FLAGS "-Wl,--version-script,${symbol_map}"
 )
 
 target_link_libraries(mirclientplatformandroid
@@ -33,20 +34,4 @@
   ${LIBHARDWARE_LIBRARIES}
 )
 
-install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/${CLIENT_DRIVER}/android)
-
-if (MIR_TEST_PLATFORM STREQUAL "android")
-  add_custom_command(TARGET mirclientplatformandroid
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E remove ${MIR_CLIENT_DRIVER_BINARY}
-    COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirclientplatformandroid> ${MIR_CLIENT_DRIVER_BINARY}
-    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-  )
-
-  install(CODE
-    "execute_process(
-       COMMAND ln -sf mir/${CLIENT_DRIVER}/android/${MIR_CLIENT_DRIVER_BINARY}
-       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
-     )"
-  )
-endif()
+install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${MIR_CLIENT_PLATFORM_PATH})

=== modified file 'src/client/android/android_native_display_container.cpp'
--- src/client/android/android_native_display_container.cpp	2014-11-24 02:16:00 +0000
+++ src/client/android/android_native_display_container.cpp	2014-11-27 07:32:44 +0000
@@ -62,16 +62,28 @@
 bool
 mcla::AndroidNativeDisplayContainer::validate(MirEGLNativeDisplayType display) const
 {
-    return mir_connection_is_valid(static_cast<MirConnection*>(display));
+    std::lock_guard<std::mutex> lg(guard);
+    return (valid_displays.find(display) != valid_displays.end());
 }
 
 MirEGLNativeDisplayType
-mcla::AndroidNativeDisplayContainer::create(MirConnection* connection)
+mcla::AndroidNativeDisplayContainer::create(ClientContext* context)
 {
-    return static_cast<MirEGLNativeDisplayType>(connection);
+    std::lock_guard<std::mutex> lg(guard);
+    auto egl_display = static_cast<MirEGLNativeDisplayType>(context);
+    valid_displays.insert(egl_display);
+
+    return egl_display;
 }
 
 void
-mcla::AndroidNativeDisplayContainer::release(MirEGLNativeDisplayType /* display */)
+mcla::AndroidNativeDisplayContainer::release(MirEGLNativeDisplayType display)
 {
+    std::lock_guard<std::mutex> lg(guard);
+
+    auto it = valid_displays.find(display);
+    if (it == valid_displays.end())
+        return;
+
+    valid_displays.erase(it);
 }

=== modified file 'src/client/android/android_native_display_container.h'
--- src/client/android/android_native_display_container.h	2013-05-02 00:11:18 +0000
+++ src/client/android/android_native_display_container.h	2014-11-27 07:32:44 +0000
@@ -23,6 +23,9 @@
 
 #include "mir_toolkit/client_types.h"
 
+#include <unordered_set>
+#include <mutex>
+
 namespace mir
 {
 namespace client
@@ -36,7 +39,7 @@
     AndroidNativeDisplayContainer();
     virtual ~AndroidNativeDisplayContainer();
 
-    MirEGLNativeDisplayType create(MirConnection* connection);
+    MirEGLNativeDisplayType create(ClientContext* context) override;
     void release(MirEGLNativeDisplayType display);
 
     bool validate(MirEGLNativeDisplayType display) const;
@@ -44,6 +47,10 @@
 protected:
     AndroidNativeDisplayContainer(AndroidNativeDisplayContainer const&) = delete;
     AndroidNativeDisplayContainer& operator=(AndroidNativeDisplayContainer const&) = delete;
+
+private:
+    std::mutex mutable guard;
+    std::unordered_set<MirEGLNativeDisplayType> valid_displays;
 };
 
 }

=== modified file 'src/client/android/client_platform_factory.cpp'
--- src/client/android/client_platform_factory.cpp	2014-02-07 15:43:41 +0000
+++ src/client/android/client_platform_factory.cpp	2014-11-27 07:32:44 +0000
@@ -16,19 +16,35 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "client_platform_factory.h"
+#include "../client_platform_factory.h"
+#include "mir_toolkit/client_types.h"
+#include "../client_context.h"
 #include "android_client_platform.h"
 
+#include <stdexcept>
+
 namespace mcl = mir::client;
 namespace mcla = mcl::android;
 
-std::shared_ptr<mcl::ClientPlatform>
-mcla::ClientPlatformFactory::create_client_platform(mcl::ClientContext* /*context*/)
+extern "C" std::shared_ptr<mcl::ClientPlatform>
+mcl::create_client_platform(mcl::ClientContext* context)
 {
+    MirPlatformPackage platform;
+    context->populate(platform);
+    if (platform.data_items != 0 || platform.fd_items != 0)
+    {
+        throw new std::runtime_error{"Attempted to create Android client platform on non-Android server"};
+    }
     return std::make_shared<mcla::AndroidClientPlatform>();
 }
 
-extern "C" std::shared_ptr<mcl::ClientPlatformFactory> mcl::create_client_platform_factory()
+extern "C" bool
+mcl::is_appropriate_module(mcl::ClientContext* context)
 {
-    return std::make_shared<mcla::ClientPlatformFactory>();
+    MirPlatformPackage platform;
+    context->populate(platform);
+    // TODO: Actually check what platform we're using, rather than blindly
+    //       hope we can distinguish them from the stuff they've put in the
+    //       PlatformPackage.
+    return platform.data_items == 0 && platform.fd_items == 0;
 }

=== modified file 'src/client/android/client_platform_factory.h'
--- src/client/android/client_platform_factory.h	2014-02-07 15:43:41 +0000
+++ src/client/android/client_platform_factory.h	2014-11-27 07:32:44 +0000
@@ -28,11 +28,8 @@
 namespace android
 {
 
-class ClientPlatformFactory : public client::ClientPlatformFactory
-{
-public:
-    std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context) override;
-};
+extern "C" std::shared_ptr<ClientPlatform>
+create_client_platform(ClientContext* context);
 
 }
 }

=== modified file 'src/client/android/symbols.map'
--- src/client/android/symbols.map	2014-11-24 02:16:00 +0000
+++ src/client/android/symbols.map	2014-11-27 07:32:44 +0000
@@ -1,5 +1,6 @@
-MIR_CLIENTPLATFORM_1 {
-  global: 
-    create_client_platform_factory;
+MIR_CLIENT_PLATFORM_2 {
+  global:
+    create_client_platform;
+    is_appropriate_module;
   local: *;
-};
\ No newline at end of file
+};

=== modified file 'src/client/client_context.h'
--- src/client/client_context.h	2013-08-28 03:41:48 +0000
+++ src/client/client_context.h	2014-11-27 07:32:44 +0000
@@ -29,7 +29,6 @@
 public:
     virtual ~ClientContext() {}
 
-    virtual MirConnection* mir_connection() = 0;
     virtual void populate(MirPlatformPackage& platform_package) = 0;
 
 protected:

=== modified file 'src/client/client_platform_factory.h'
--- src/client/client_platform_factory.h	2014-03-06 06:05:17 +0000
+++ src/client/client_platform_factory.h	2014-11-27 07:32:44 +0000
@@ -41,8 +41,11 @@
     ClientPlatformFactory& operator=(ClientPlatformFactory const& p) = delete;
 };
 
-extern "C" typedef std::shared_ptr<ClientPlatformFactory>(*CreateClientPlatformFactory)();
-extern "C" std::shared_ptr<ClientPlatformFactory> create_client_platform_factory();
+extern "C" typedef std::shared_ptr<ClientPlatform>(*CreateClientPlatform)(ClientContext* context);
+extern "C" std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context);
+
+extern "C" typedef bool (*ClientPlatformProbe)(ClientContext* context);
+extern "C" bool is_appropriate_module(ClientContext* context);
 
 }
 }

=== modified file 'src/client/connection_configuration.h'
--- src/client/connection_configuration.h	2014-11-24 02:16:00 +0000
+++ src/client/connection_configuration.h	2014-11-27 07:32:44 +0000
@@ -39,8 +39,6 @@
 class Logger;
 }
 
-class SharedLibrary;
-
 namespace client
 {
 class ConnectionSurfaceMap;
@@ -65,7 +63,6 @@
     virtual std::shared_ptr<LifecycleControl> the_lifecycle_control() = 0;
     virtual std::shared_ptr<EventSink> the_event_sink() = 0;
     virtual std::shared_ptr<EventHandlerRegister> the_event_handler_register() = 0;
-    virtual std::shared_ptr<SharedLibrary> the_platform_library() = 0;
 
 protected:
     ConnectionConfiguration() = default;

=== modified file 'src/client/default_connection_configuration.cpp'
--- src/client/default_connection_configuration.cpp	2014-11-24 02:16:00 +0000
+++ src/client/default_connection_configuration.cpp	2014-11-27 07:32:44 +0000
@@ -35,6 +35,7 @@
 #include "lifecycle_control.h"
 #include "mir/shared_library.h"
 #include "client_platform_factory.h"
+#include "probing_client_platform_factory.h"
 #include "mir_event_distributor.h"
 #include "mir/shared_library_prober.h"
 
@@ -47,7 +48,10 @@
 std::string const off_opt_val{"off"};
 std::string const log_opt_val{"log"};
 std::string const lttng_opt_val{"lttng"};
-std::string const default_platform_lib{MIR_CLIENT_DRIVER_BINARY};
+
+// Shove this here until we properly manage the lifetime of our
+// loadable modules
+std::shared_ptr<mcl::ProbingClientPlatformFactory> the_platform_prober;
 
 // Hack around the way Qt loads mir:
 // qtmir and therefore Mir are loaded via dlopen(..., RTLD_LOCAL).
@@ -108,11 +112,23 @@
     return client_platform_factory(
         [this]
         {
-            auto const create_client_platform_factory =
-                the_platform_library()->load_function<mcl::CreateClientPlatformFactory>(
-                    "create_client_platform_factory");
-
-            return create_client_platform_factory();
+	    ensure_loaded_with_rtld_global();
+            auto const platform_override = getenv("MIR_CLIENT_PLATFORM_LIB");
+            std::vector<std::shared_ptr<mir::SharedLibrary>> platform_plugins;
+            if (platform_override)
+            {
+                platform_plugins.push_back(std::make_shared<mir::SharedLibrary>(platform_override));
+            }
+            else
+            {
+                auto const platform_path_override = getenv("MIR_CLIENT_PLATFORM_PATH");
+                auto const platform_path = platform_path_override ? platform_path_override : MIR_CLIENT_PLATFORM_PATH;
+                platform_plugins = mir::libraries_for_path(platform_path, *the_shared_library_prober_report());
+            }
+
+            the_platform_prober = std::make_shared<mcl::ProbingClientPlatformFactory>(platform_plugins);
+
+            return the_platform_prober;
         });
 }
 
@@ -211,6 +227,7 @@
         {
             auto val_raw = getenv("MIR_CLIENT_SHARED_LIBRARY_PROBER_REPORT");
             std::string const val{val_raw ? val_raw : off_opt_val};
+
             if (val == log_opt_val)
                 return std::make_shared<mir::logging::SharedLibraryProberReport>(the_logger());
             else if (val == lttng_opt_val)
@@ -219,15 +236,3 @@
                 return std::make_shared<mir::logging::NullSharedLibraryProberReport>();
         });
 }
-
-std::shared_ptr<mir::SharedLibrary> mcl::DefaultConnectionConfiguration::the_platform_library()
-{
-    if (!platform_library)
-    {
-        ensure_loaded_with_rtld_global();
-        auto const val_raw = getenv("MIR_CLIENT_PLATFORM_LIB");
-        std::string const libname{val_raw ? val_raw : default_platform_lib};
-        platform_library = std::make_shared<mir::SharedLibrary>(libname);
-    }
-    return platform_library;
-}

=== modified file 'src/client/default_connection_configuration.h'
--- src/client/default_connection_configuration.h	2014-11-24 02:16:00 +0000
+++ src/client/default_connection_configuration.h	2014-11-27 07:32:44 +0000
@@ -60,16 +60,12 @@
     std::shared_ptr<EventSink> the_event_sink() override;
     std::shared_ptr<EventHandlerRegister> the_event_handler_register() override;
     std::shared_ptr<mir::SharedLibraryProberReport> the_shared_library_prober_report();
-    std::shared_ptr<SharedLibrary> the_platform_library() override;
 
     virtual std::string the_socket_file();
     virtual std::shared_ptr<rpc::RpcReport> the_rpc_report();
     virtual std::shared_ptr<input::receiver::InputReceiverReport> the_input_receiver_report();
 
 protected:
-    // MUST be first data member so it is destroyed last.
-    std::shared_ptr<mir::SharedLibrary> platform_library;
-
     CachedPtr<google::protobuf::RpcChannel> rpc_channel;
     CachedPtr<mir::logging::Logger> logger;
     CachedPtr<ClientPlatformFactory> client_platform_factory;

=== modified file 'src/client/egl_native_display_container.h'
--- src/client/egl_native_display_container.h	2014-03-06 06:05:17 +0000
+++ src/client/egl_native_display_container.h	2014-11-27 07:32:44 +0000
@@ -26,12 +26,14 @@
 namespace client
 {
 
+class ClientContext;
+
 class EGLNativeDisplayContainer
 {
 public:
     virtual ~EGLNativeDisplayContainer() {}
 
-    virtual MirEGLNativeDisplayType create(MirConnection* connection) = 0;
+    virtual MirEGLNativeDisplayType create(ClientContext* context) = 0;
     virtual void release(MirEGLNativeDisplayType display) = 0;
 
     virtual bool validate(MirEGLNativeDisplayType display) const = 0;

=== modified file 'src/client/mesa/CMakeLists.txt'
--- src/client/mesa/CMakeLists.txt	2014-11-24 02:16:00 +0000
+++ src/client/mesa/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -15,7 +15,7 @@
 )
 
 add_library(
-  mirclientplatformmesa SHARED
+  mirclientplatformmesa MODULE
 
   $<TARGET_OBJECTS:mirclientplatformmesaobjects>
   $<TARGET_OBJECTS:mirclient_platformimpl>
@@ -23,9 +23,10 @@
 
 set_target_properties(
   mirclientplatformmesa PROPERTIES
-  OUTPUT_NAME ${MIR_CLIENT_DRIVER}
-  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
-  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
+  OUTPUT_NAME mesa
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/client-modules
+  PREFIX ""
+  LINK_FLAGS "-Wl,--version-script,${symbol_map}"
 )
 
 target_link_libraries(mirclientplatformmesa
@@ -33,21 +34,4 @@
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
 )
 
-install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/${CLIENT_DRIVER}/mesa)
-
-if (MIR_TEST_PLATFORM STREQUAL "mesa")
-  add_custom_command(TARGET mirclientplatformmesa
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E remove ${MIR_CLIENT_DRIVER_BINARY}
-    COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirclientplatformmesa> ${MIR_CLIENT_DRIVER_BINARY}
-    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-  )
-
-  install(CODE
-    "execute_process(
-       COMMAND ln -sf mir/${CLIENT_DRIVER}/mesa/${MIR_CLIENT_DRIVER_BINARY}
-       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
-     )"
-  )
-endif()
-
+install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${MIR_CLIENT_PLATFORM_PATH})

=== modified file 'src/client/mesa/client_platform.cpp'
--- src/client/mesa/client_platform.cpp	2014-03-06 06:05:17 +0000
+++ src/client/mesa/client_platform.cpp	2014-11-27 07:32:44 +0000
@@ -95,7 +95,7 @@
 std::shared_ptr<EGLNativeDisplayType> mclm::ClientPlatform::create_egl_native_display()
 {
     MirEGLNativeDisplayType *mir_native_display = new MirEGLNativeDisplayType;
-    *mir_native_display = display_container.create(context->mir_connection());
+    *mir_native_display = display_container.create(context);
     auto egl_native_display = reinterpret_cast<EGLNativeDisplayType*>(mir_native_display);
 
     return std::shared_ptr<EGLNativeDisplayType>(egl_native_display, NativeDisplayDeleter(display_container));

=== modified file 'src/client/mesa/client_platform_factory.cpp'
--- src/client/mesa/client_platform_factory.cpp	2014-02-07 15:43:41 +0000
+++ src/client/mesa/client_platform_factory.cpp	2014-11-27 07:32:44 +0000
@@ -16,13 +16,16 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "client_platform_factory.h"
+#include "../client_platform_factory.h"
 #include "client_platform.h"
+#include "mir_toolkit/client_types.h"
+#include "../client_context.h"
 #include "buffer_file_ops.h"
 #include "../egl_native_display_container.h"
 
 #include <sys/mman.h>
 #include <unistd.h>
+#include <stdexcept>
 
 namespace mcl = mir::client;
 namespace mclm = mcl::mesa;
@@ -57,15 +60,26 @@
 
 }
 
-std::shared_ptr<mcl::ClientPlatform>
-mclm::ClientPlatformFactory::create_client_platform(mcl::ClientContext* context)
+extern "C" std::shared_ptr<mcl::ClientPlatform> mcl::create_client_platform(mcl::ClientContext* context)
 {
+    MirPlatformPackage package;
+    context->populate(package);
+    if (package.data_items != 0 || package.fd_items != 1)
+    {
+        throw std::runtime_error{"Attempted to create Mesa client platform on non-Mesa server"};
+    }
     auto buffer_file_ops = std::make_shared<RealBufferFileOps>();
     return std::make_shared<mclm::ClientPlatform>(
         context, buffer_file_ops, mcl::EGLNativeDisplayContainer::instance());
 }
 
-extern "C" std::shared_ptr<mcl::ClientPlatformFactory> mcl::create_client_platform_factory()
+extern "C" bool
+mcl::is_appropriate_module(mcl::ClientContext* context)
 {
-    return std::make_shared<mclm::ClientPlatformFactory>();
+    MirPlatformPackage platform;
+    context->populate(platform);
+    // TODO: Actually check what platform we're using, rather than blindly
+    //       hope we can distinguish them from the stuff they've put in the
+    //       PlatformPackage.
+    return platform.data_items == 0 && platform.fd_items == 1;
 }

=== modified file 'src/client/mesa/client_platform_factory.h'
--- src/client/mesa/client_platform_factory.h	2014-02-07 15:43:41 +0000
+++ src/client/mesa/client_platform_factory.h	2014-11-27 07:32:44 +0000
@@ -28,11 +28,6 @@
 namespace mesa
 {
 
-class ClientPlatformFactory : public client::ClientPlatformFactory
-{
-public:
-    std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context) override;
-};
 
 }
 }

=== modified file 'src/client/mesa/mesa_native_display_container.cpp'
--- src/client/mesa/mesa_native_display_container.cpp	2014-11-24 02:16:00 +0000
+++ src/client/mesa/mesa_native_display_container.cpp	2014-11-27 07:32:44 +0000
@@ -18,7 +18,7 @@
 
 #include "mesa_native_display_container.h"
 
-#include "mir_toolkit/mir_client_library.h"
+#include "../client_context.h"
 
 #include <cstring>
 #include <unordered_set>
@@ -35,8 +35,8 @@
 static int egl_display_get_platform(MirMesaEGLNativeDisplay* display,
                                     MirPlatformPackage* package)
 {
-    auto connection = static_cast<MirConnection*>(display->context);
-    mir_connection_get_platform(connection, package);
+    auto context = static_cast<mcl::ClientContext*>(display->context);
+    context->populate(*package);
     return MIR_MESA_TRUE;
 }
 
@@ -93,11 +93,11 @@
 }
 
 MirEGLNativeDisplayType
-mclm::MesaNativeDisplayContainer::create(MirConnection* connection)
+mclm::MesaNativeDisplayContainer::create(ClientContext* context)
 {
     MirMesaEGLNativeDisplay* display = new MirMesaEGLNativeDisplay();
     display->display_get_platform = egl_display_get_platform;
-    display->context = connection;
+    display->context = context;
 
     std::lock_guard<std::mutex> lg(guard);
     auto egl_display = static_cast<MirEGLNativeDisplayType>(display);

=== modified file 'src/client/mesa/mesa_native_display_container.h'
--- src/client/mesa/mesa_native_display_container.h	2014-03-06 06:05:17 +0000
+++ src/client/mesa/mesa_native_display_container.h	2014-11-27 07:32:44 +0000
@@ -40,7 +40,7 @@
     MesaNativeDisplayContainer();
     virtual ~MesaNativeDisplayContainer();
 
-    MirEGLNativeDisplayType create(MirConnection* connection);
+    MirEGLNativeDisplayType create(ClientContext* context);
     void release(MirEGLNativeDisplayType display);
 
     bool validate(MirEGLNativeDisplayType display) const;

=== modified file 'src/client/mesa/native_surface.cpp'
--- src/client/mesa/native_surface.cpp	2014-11-24 02:16:00 +0000
+++ src/client/mesa/native_surface.cpp	2014-11-27 07:32:44 +0000
@@ -20,7 +20,6 @@
 #include "../client_buffer.h"
 #include "native_surface.h"
 
-#include <iostream>
 #include <boost/exception/diagnostic_information.hpp> 
 
 namespace mclm=mir::client::mesa;

=== modified file 'src/client/mesa/symbols.map'
--- src/client/mesa/symbols.map	2014-11-24 02:16:00 +0000
+++ src/client/mesa/symbols.map	2014-11-27 07:32:44 +0000
@@ -1,7 +1,9 @@
-MIR_CLIENTPLATFORM_1 {
-  global: 
-    create_client_platform_factory;
+MIR_CLIENT_PLATFORM_2 {
+  global:
+    create_client_platform;
+    is_appropriate_module;
     # Needed by our Mesa EGL platform
     mir_client_mesa_egl_native_display_is_valid;
-  local: *;
+  local:
+    *;
 };

=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2014-11-24 02:16:00 +0000
+++ src/client/mir_connection.cpp	2014-11-27 07:32:44 +0000
@@ -95,11 +95,11 @@
 MirConnection::MirConnection(
     mir::client::ConnectionConfiguration& conf) :
         deregisterer{this},
-        platform_library{conf.the_platform_library()},
         channel(conf.the_rpc_channel()),
         server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL),
         debug(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL),
         logger(conf.the_logger()),
+        connect_done{false},
         client_platform_factory(conf.the_client_platform_factory()),
         input_platform(conf.the_input_platform()),
         display_configuration(conf.the_display_configuration()),
@@ -235,6 +235,9 @@
                 set_error_message("Connect failed");
             }
         }
+
+        connect_done = true;
+
         /*
          * We need to create the client platform after the connection has been
          * established, to ensure that the client platform has access to all
@@ -370,9 +373,9 @@
 
 void MirConnection::populate(MirPlatformPackage& platform_package)
 {
-    std::lock_guard<decltype(mutex)> lock(mutex);
-
-    if (!connect_result.has_error() && connect_result.has_platform())
+    // connect_result is write-once: once it's valid, we don't need to lock
+    // to use it.
+    if (connect_done && !connect_result.has_error() && connect_result.has_platform())
     {
         auto const& platform = connect_result.platform();
 
@@ -428,11 +431,6 @@
     return platform;
 }
 
-MirConnection* MirConnection::mir_connection()
-{
-    return this;
-}
-
 EGLNativeDisplayType MirConnection::egl_native_display()
 {
     std::lock_guard<decltype(mutex)> lock(mutex);

=== modified file 'src/client/mir_connection.h'
--- src/client/mir_connection.h	2014-11-24 02:16:00 +0000
+++ src/client/mir_connection.h	2014-11-27 07:32:44 +0000
@@ -22,6 +22,7 @@
 #include <memory>
 #include <unordered_set>
 #include <unordered_map>
+#include <atomic>
 
 #include <mutex>
 
@@ -117,8 +118,6 @@
 
     static bool is_valid(MirConnection *connection);
 
-    MirConnection* mir_connection();
-
     EGLNativeDisplayType egl_native_display();
 
     void on_surface_created(int id, MirSurface* surface);
@@ -153,6 +152,7 @@
     std::shared_ptr<mir::logging::Logger> const logger;
     mir::protobuf::Void void_response;
     mir::protobuf::Connection connect_result;
+    std::atomic<bool> connect_done;
     mir::protobuf::Void ignored;
     mir::protobuf::ConnectParameters connect_parameters;
     mir::protobuf::DRMAuthMagicStatus drm_auth_magic_status;

=== added file 'src/client/probing_client_platform_factory.cpp'
--- src/client/probing_client_platform_factory.cpp	1970-01-01 00:00:00 +0000
+++ src/client/probing_client_platform_factory.cpp	2014-11-27 07:32:44 +0000
@@ -0,0 +1,38 @@
+#include "probing_client_platform_factory.h"
+
+#include <boost/exception/all.hpp>
+#include <stdexcept>
+
+namespace mcl = mir::client;
+
+mcl::ProbingClientPlatformFactory::ProbingClientPlatformFactory(std::vector<std::shared_ptr<mir::SharedLibrary>> const& modules)
+    : platform_modules{modules}
+{
+    if (modules.empty())
+    {
+        BOOST_THROW_EXCEPTION(
+            std::runtime_error{"Attempted to create a ClientPlatformFactory with no platform modules"});
+    }
+}
+
+std::shared_ptr<mcl::ClientPlatform>
+mcl::ProbingClientPlatformFactory::create_client_platform(mcl::ClientContext* context)
+{
+    for (auto& module : platform_modules)
+    {
+        try
+        {
+            auto probe = module->load_function<mir::client::ClientPlatformProbe>("is_appropriate_module", CLIENT_PLATFORM_VERSION);
+            if (probe(context))
+            {
+                auto factory = module->load_function<mir::client::CreateClientPlatform>("create_client_platform", CLIENT_PLATFORM_VERSION);
+                return factory(context);
+            }
+        }
+        catch(std::runtime_error)
+        {
+            // We were handled a SharedLibrary that's not a client platform module?
+        }
+    }
+    BOOST_THROW_EXCEPTION(std::runtime_error{"No appropriate client platform module found"});
+}

=== added file 'src/client/probing_client_platform_factory.h'
--- src/client/probing_client_platform_factory.h	1970-01-01 00:00:00 +0000
+++ src/client/probing_client_platform_factory.h	2014-11-27 07:32:44 +0000
@@ -0,0 +1,27 @@
+#ifndef MIR_CLIENT_PROBING_CLIENT_PLATFORM_FACTORY_H_
+#define MIR_CLIENT_PROBING_CLIENT_PLATFORM_FACTORY_H_
+
+#include <vector>
+
+#include "client_platform_factory.h"
+#include "mir/shared_library.h"
+
+namespace mir
+{
+namespace client
+{
+class ProbingClientPlatformFactory : public ClientPlatformFactory
+{
+public:
+    ProbingClientPlatformFactory(std::vector<std::shared_ptr<SharedLibrary>> const& modules);
+
+    std::shared_ptr<ClientPlatform> create_client_platform(ClientContext *context) override;
+private:
+    std::vector<std::shared_ptr<SharedLibrary>> platform_modules;
+};
+
+
+}
+}
+
+#endif // MIR_CLIENT_PROBING_CLIENT_PLATFORM_FACTORY_H_

=== modified file 'src/common/graphics/android/mir_native_window.cpp'
--- src/common/graphics/android/mir_native_window.cpp	2014-11-24 02:16:00 +0000
+++ src/common/graphics/android/mir_native_window.cpp	2014-11-27 07:32:44 +0000
@@ -20,7 +20,6 @@
 #include "mir/graphics/android/android_driver_interpreter.h"
 #include "mir/graphics/android/sync_fence.h"
 
-#include <iostream>
 #include <boost/exception/diagnostic_information.hpp> 
 
 namespace mg=mir::graphics;

=== modified file 'src/common/symbols.map'
--- src/common/symbols.map	2014-11-24 02:16:00 +0000
+++ src/common/symbols.map	2014-11-27 07:32:44 +0000
@@ -150,6 +150,7 @@
     # but they are used by libmirplatform, libmirclient or libmirserver
     mir::default_server_socket;
     mir::input::android::Lexicon::translate*;
+    mir::libraries_for_path*;
     mir::logging::input_timestamp*;
     mir::logging::log*;
     mir::logging::set_logger*;

=== removed file 'src/include/platform/mir/shared_library_loader.h'
--- src/include/platform/mir/shared_library_loader.h	2014-11-24 02:16:00 +0000
+++ src/include/platform/mir/shared_library_loader.h	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Kevin DuBois <[e-mail]>
- */
-
-#ifndef MIR_SHARED_LIBRARY_LOADER_H_
-#define MIR_SHARED_LIBRARY_LOADER_H_
-
-#include <string>
-namespace mir
-{
-class SharedLibrary;
-SharedLibrary const* load_library(std::string const& libname);
-}
-#endif

=== modified file 'src/platform/CMakeLists.txt'
--- src/platform/CMakeLists.txt	2014-11-27 03:48:20 +0000
+++ src/platform/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -7,20 +7,28 @@
 
 set(MIRPLATFORM_ABI 4)
 
-set(PLATFORM_DRIVER platform${MIRPLATFORM_ABI}driver)
-set(MIR_PLATFORM_DRIVER mir${PLATFORM_DRIVER})
-set(MIR_PLATFORM_DRIVER_BINARY lib${MIR_PLATFORM_DRIVER}.so
-    CACHE STRING "File name of Mir server platform drivers")
-add_definitions(-DMIR_PLATFORM_DRIVER_BINARY="${MIR_PLATFORM_DRIVER_BINARY}")
-
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
-add_library(mirplatformobjects OBJECT
-  shared_library_loader.cpp
-)
+# This needs to change whenever the ABI between the platform
+# modules and the server changes in an incompatible way.
+# This ABI is much smaller than the full libmirplatform ABI.
+#
+# TODO: Add an extra driver-ABI check target.
+set(SERVER_PLATFORM_VERSION "MIR_GRAPHICS_PLATFORM_1")
+set(SERVER_PLATFORM_VERSION ${SERVER_PLATFORM_VERSION} PARENT_SCOPE)
+
+set(MIR_SERVER_PLATFORM_PLUGIN_PATH
+  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mir/server-platform
+)
+set(MIR_SERVER_PLATFORM_PLUGIN_PATH
+  ${MIR_SERVER_PLATFORM_PLUGIN_PATH}
+  PARENT_SCOPE
+)
+
+add_definitions(-DMIR_SERVER_PLATFORM_PLUGIN_PATH="${MIR_SERVER_PLATFORM_PLUGIN_PATH}")
+add_definitions(-DSERVER_PLATFORM_VERSION="${SERVER_PLATFORM_VERSION}")
 
 set(MIR_PLATFORM_OBJECTS
-  $<TARGET_OBJECTS:mirplatformobjects>
   $<TARGET_OBJECTS:mirplatformgraphicscommon>
   $<TARGET_OBJECTS:miroptions>
   $<TARGET_OBJECTS:mirfatal>
@@ -39,17 +47,19 @@
 )
 
 target_link_libraries(mirplatform
+
   mircommon
   ${MIR_PLATFORM_REFERENCES}
 )
 
-set_target_properties(mirplatform
+set_target_properties(
+  mirplatform
+
   PROPERTIES
   SOVERSION ${MIRPLATFORM_ABI}
   LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
 )
 
-
 install(TARGETS mirplatform LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 add_subdirectory(graphics/)

=== modified file 'src/platform/graphics/CMakeLists.txt'
--- src/platform/graphics/CMakeLists.txt	2014-11-24 02:16:00 +0000
+++ src/platform/graphics/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -12,6 +12,7 @@
   gl_program.cpp
   gl_texture.cpp
   tessellation_helpers.cpp
+  platform_probe.cpp
 )
 
 add_library(mirplatformgraphicscommon OBJECT

=== modified file 'src/platform/graphics/android/CMakeLists.txt'
--- src/platform/graphics/android/CMakeLists.txt	2014-11-24 02:16:00 +0000
+++ src/platform/graphics/android/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -36,20 +36,17 @@
   ipc_operations.cpp
   buffer_writer.cpp
 )
+
 add_library(mirplatformgraphicsandroid SHARED
+
   $<TARGET_OBJECTS:mirplatformgraphicsandroidobjects>
 )
 
-set_target_properties(
-  mirplatformgraphicsandroid PROPERTIES
-  OUTPUT_NAME ${MIR_PLATFORM_DRIVER}
-  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/android
-  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
-)
+target_link_libraries(
+  mirplatformgraphicsandroid
 
-target_link_libraries(mirplatformgraphicsandroid
+  mirsharedandroid
   mirplatform
-  mirsharedandroid
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
   ${LIBHARDWARE_LIBRARIES}
   ${EGL_LDFLAGS} ${EGL_LIBRARIES}
@@ -57,20 +54,14 @@
   ${ANDROID_PROPERTIES_LDFLAGS}
 )
 
-install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/${PLATFORM_DRIVER}/android)
-
-if (MIR_TEST_PLATFORM STREQUAL "android")
-  add_custom_command(TARGET mirplatformgraphicsandroid
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E remove ${MIR_PLATFORM_DRIVER_BINARY}
-    COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirplatformgraphicsandroid> ${MIR_PLATFORM_DRIVER_BINARY}
-    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-  )
-
-  install(CODE
-    "execute_process(
-       COMMAND ln -sf mir/${PLATFORM_DRIVER}/android/${MIR_PLATFORM_DRIVER_BINARY}
-       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
-     )"
-  )
-endif()
+set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
+
+set_target_properties(
+  mirplatformgraphicsandroid PROPERTIES
+  OUTPUT_NAME graphics-android
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/server-modules
+  PREFIX ""
+  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
+)
+
+install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PLUGIN_PATH})

=== modified file 'src/platform/graphics/android/platform.cpp'
--- src/platform/graphics/android/platform.cpp	2014-11-24 02:16:00 +0000
+++ src/platform/graphics/android/platform.cpp	2014-11-27 07:32:44 +0000
@@ -170,3 +170,22 @@
          boost::program_options::value<bool>()->default_value(false),
          "[platform-specific] Whether to disable overlay optimizations [{on,off}]");
 }
+
+extern "C" mg::PlatformPriority probe_platform()
+{
+    int err;
+    hw_module_t const* hw_module;
+
+    err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &hw_module);
+
+    return err < 0 ? mg::PlatformPriority::unsupported : mg::PlatformPriority::best;
+}
+
+mg::ModuleProperties const description = {
+    "android"
+};
+
+extern "C" mg::ModuleProperties const* describe_module()
+{
+    return &description;
+}

=== added file 'src/platform/graphics/android/symbols.map'
--- src/platform/graphics/android/symbols.map	1970-01-01 00:00:00 +0000
+++ src/platform/graphics/android/symbols.map	2014-11-27 07:32:44 +0000
@@ -0,0 +1,8 @@
+MIR_GRAPHICS_PLATFORM_1 {
+  global:
+    add_platform_options;
+    create_platform;
+    create_native_platform;
+    probe_platform;
+    describe_module;
+};

=== modified file 'src/platform/graphics/mesa/CMakeLists.txt'
--- src/platform/graphics/mesa/CMakeLists.txt	2014-11-24 02:16:00 +0000
+++ src/platform/graphics/mesa/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -11,7 +11,9 @@
 string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 add_definitions(-D__GBM__)
 
-add_library(mirplatformgraphicsmesaobjects OBJECT
+add_library(
+  mirplatformgraphicsmesaobjects OBJECT
+
   platform.cpp
   buffer_allocator.cpp
   gbm_buffer.cpp
@@ -36,18 +38,15 @@
   nested_authentication.cpp
 )
 
-add_library(mirplatformgraphicsmesa SHARED
+add_library(
+  mirplatformgraphicsmesa MODULE
+
   $<TARGET_OBJECTS:mirplatformgraphicsmesaobjects>
 )
 
-set_target_properties(
-  mirplatformgraphicsmesa PROPERTIES
-  OUTPUT_NAME ${MIR_PLATFORM_DRIVER}
-  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
-  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
-)
+target_link_libraries(
+  mirplatformgraphicsmesa
 
-target_link_libraries(mirplatformgraphicsmesa
   mirplatform
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
@@ -56,20 +55,14 @@
   ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
 )
 
-install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/${PLATFORM_DRIVER}/mesa)
-
-if (MIR_TEST_PLATFORM STREQUAL "mesa")
-  add_custom_command(TARGET mirplatformgraphicsmesa
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E remove ${MIR_PLATFORM_DRIVER_BINARY}
-    COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirplatformgraphicsmesa> ${MIR_PLATFORM_DRIVER_BINARY}
-    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-  )
-
-  install(CODE
-    "execute_process(
-       COMMAND ln -sf mir/${PLATFORM_DRIVER}/mesa/${MIR_PLATFORM_DRIVER_BINARY}
-       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
-     )"
-  )
-endif()
+set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
+
+set_target_properties(
+  mirplatformgraphicsmesa PROPERTIES
+  OUTPUT_NAME graphics-mesa
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/server-modules
+  PREFIX ""
+  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
+)
+
+install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PLUGIN_PATH})

=== modified file 'src/platform/graphics/mesa/platform.cpp'
--- src/platform/graphics/mesa/platform.cpp	2014-11-24 02:16:00 +0000
+++ src/platform/graphics/mesa/platform.cpp	2014-11-27 07:32:44 +0000
@@ -28,6 +28,7 @@
 #include "mir/options/option.h"
 #include "mir/graphics/native_buffer.h"
 #include "mir/emergency_cleanup_registry.h"
+#include "mir/udev/wrapper.h"
 
 
 #include <boost/throw_exception.hpp>
@@ -224,3 +225,30 @@
          boost::program_options::value<bool>()->default_value(true),
          "[platform-specific] utilize the bypass optimization for fullscreen surfaces.");
 }
+
+extern "C" mg::PlatformPriority probe_platform()
+{
+    auto udev = std::make_shared<mir::udev::Context>();
+
+    mir::udev::Enumerator drm_devices{udev};
+    drm_devices.match_subsystem("drm");
+    drm_devices.match_sysname("card[0-9]*");
+    drm_devices.scan_devices();
+
+    for(auto& device : drm_devices)
+    {
+        static_cast<void>(device);
+        return mg::PlatformPriority::best;
+    }
+
+    return mg::PlatformPriority::unsupported;
+}
+
+mg::ModuleProperties const description = {
+    "mesa"
+};
+
+extern "C" mg::ModuleProperties const* describe_module()
+{
+    return &description;
+}

=== added file 'src/platform/graphics/mesa/symbols.map'
--- src/platform/graphics/mesa/symbols.map	1970-01-01 00:00:00 +0000
+++ src/platform/graphics/mesa/symbols.map	2014-11-27 07:32:44 +0000
@@ -0,0 +1,8 @@
+MIR_GRAPHICS_PLATFORM_1 {
+  global:
+    add_platform_options;
+    create_platform;
+    create_native_platform;
+    probe_platform;
+    describe_module;
+};

=== added file 'src/platform/graphics/platform_probe.cpp'
--- src/platform/graphics/platform_probe.cpp	1970-01-01 00:00:00 +0000
+++ src/platform/graphics/platform_probe.cpp	2014-11-27 07:32:44 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "mir/graphics/platform.h"
+#include "platform_probe.h"
+
+std::shared_ptr<mir::SharedLibrary>
+mir::graphics::module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules)
+{
+    mir::graphics::PlatformPriority best_priority_so_far = mir::graphics::unsupported;
+    std::shared_ptr<mir::SharedLibrary> best_module_so_far;
+    for(auto& module : modules)
+    {
+        try
+        {
+            auto probe = module->load_function<mir::graphics::PlatformProbe>("probe_platform",
+                                                                             SERVER_PLATFORM_VERSION);
+            auto module_priority = probe();
+            if (module_priority > best_priority_so_far)
+            {
+                best_priority_so_far = module_priority;
+                best_module_so_far = module;
+            }
+        }
+        catch (std::runtime_error)
+        {
+            // Tried to probe a SharedLibrary that isn't a platform module?
+        }
+    }
+    if (best_priority_so_far > mir::graphics::unsupported)
+    {
+        return best_module_so_far;
+    }
+    throw std::runtime_error{"Failed to find platform for current system"};
+}

=== added file 'src/platform/graphics/platform_probe.h'
--- src/platform/graphics/platform_probe.h	1970-01-01 00:00:00 +0000
+++ src/platform/graphics/platform_probe.h	2014-11-27 07:32:44 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_PLATFORM_PROBE_H_
+#define MIR_GRAPHICS_PLATFORM_PROBE_H_
+
+#include <vector>
+#include <memory>
+#include "mir/shared_library.h"
+
+namespace mir
+{
+namespace graphics
+{
+class Platform;
+
+std::shared_ptr<SharedLibrary> module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules);
+
+}
+}
+
+#endif // MIR_GRAPHICS_PLATFORM_PROBE_H_

=== modified file 'src/platform/options/default_configuration.cpp'
--- src/platform/options/default_configuration.cpp	2014-11-24 02:16:00 +0000
+++ src/platform/options/default_configuration.cpp	2014-11-27 07:32:44 +0000
@@ -17,11 +17,12 @@
  */
 
 #include "mir/shared_library.h"
-#include "mir/shared_library_loader.h"
 #include "mir/options/default_configuration.h"
 #include "mir/graphics/platform.h"
 #include "mir/default_configuration.h"
 #include "mir/abnormal_exit.h"
+#include "mir/shared_library_prober.h"
+#include "../graphics/platform_probe.h"
 
 #include <dlfcn.h>
 
@@ -53,12 +54,14 @@
 char const* const mo::lttng_opt_value = "lttng";
 
 char const* const mo::platform_graphics_lib = "platform-graphics-lib";
+char const* const mo::platform_graphics_path = "platform-graphics-path";
 
 namespace
 {
 int const default_ipc_threads          = 1;
 bool const enable_input_default        = true;
-char const* const default_platform_graphics_lib = MIR_PLATFORM_DRIVER_BINARY;
+
+std::shared_ptr<mir::SharedLibrary> graphics_lib;
 
 // Hack around the way Qt loads mir:
 // platform_api and therefore Mir are loaded via dlopen(..., RTLD_LOCAL).
@@ -115,8 +118,10 @@
             "Socket filename [string:default=$XDG_RUNTIME_DIR/mir_socket or /tmp/mir_socket]")
         (no_server_socket_opt, "Do not provide a socket filename for client connections")
         (prompt_socket_opt, "Provide a \"..._trusted\" filename for prompt helper connections")
-        (platform_graphics_lib, po::value<std::string>()->default_value(default_platform_graphics_lib),
-            "Library to use for platform graphics support")
+        (platform_graphics_lib, po::value<std::string>(),
+            "Library to use for platform graphics support (default: autodetect)")
+        (platform_graphics_path, po::value<std::string>()->default_value(MIR_SERVER_PLATFORM_PLUGIN_PATH),
+            "Library to use for platform graphics support (default: " MIR_SERVER_PLATFORM_PLUGIN_PATH ")")
         (enable_input_opt, po::value<bool>()->default_value(enable_input_default),
             "Enable input.")
         (compositor_report_opt, po::value<std::string>()->default_value(off_opt_value),
@@ -152,32 +157,74 @@
         add_platform_options();
 }
 
+namespace
+{
+class NullSharedLibraryProberReport : public mir::SharedLibraryProberReport
+{
+public:
+    void probing_path(boost::filesystem::path const& /*path*/) override
+    {
+    }
+    void probing_failed(boost::filesystem::path const& /*path*/, std::exception const& /*error*/) override
+    {
+    }
+    void loading_library(boost::filesystem::path const& /*filename*/) override
+    {
+    }
+    void loading_failed(boost::filesystem::path const& /*filename*/, std::exception const& /*error*/) override
+    {
+    }
+};
+}
+
 void mo::DefaultConfiguration::add_platform_options()
 {
     namespace po = boost::program_options;
     po::options_description program_options;
     program_options.add_options()
         (platform_graphics_lib,
-         po::value<std::string>()->default_value(default_platform_graphics_lib), "");
+         po::value<std::string>(), "");
+    program_options.add_options()
+        (platform_graphics_path,
+         po::value<std::string>()->default_value(MIR_SERVER_PLATFORM_PLUGIN_PATH),
+        "");
     mo::ProgramOption options;
     options.parse_arguments(program_options, argc, argv);
 
-    std::string graphics_libname;
+    ensure_loaded_with_rtld_global();
+
+    // TODO: We should just load all the platform plugins we can and present their options.
     auto env_libname = ::getenv("MIR_SERVER_PLATFORM_GRAPHICS_LIB");
-    if (!options.is_set(platform_graphics_lib) && env_libname)
-    {
-        graphics_libname = std::string{env_libname};
-    }
-    else
-    {
-        graphics_libname = options.get<std::string>(platform_graphics_lib);
-    }
-
-    ensure_loaded_with_rtld_global();
-
-    auto graphics_lib = load_library(graphics_libname);
-    auto add_platform_options = graphics_lib->load_function<mir::graphics::AddPlatformOptions>(std::string("add_platform_options"));
-    add_platform_options(*this->program_options);
+    auto env_libpath = ::getenv("MIR_SERVER_PLATFORM_GRAPHICS_PATH");
+    try
+    {
+        if (options.is_set(platform_graphics_lib))
+        {
+            graphics_lib = std::make_shared<mir::SharedLibrary>(options.get<std::string>(platform_graphics_lib));
+        }
+        else if (env_libname)
+        {
+            graphics_lib = std::make_shared<mir::SharedLibrary>(std::string{env_libname});
+        }
+        else
+        {
+            auto const plugin_path = env_libpath ? env_libpath : options.get<std::string>(platform_graphics_path);
+            NullSharedLibraryProberReport nuller;
+            auto plugins = mir::libraries_for_path(plugin_path, nuller);
+            graphics_lib = mir::graphics::module_for_device(plugins);
+        }
+
+        auto add_platform_options = graphics_lib->load_function<mir::graphics::AddPlatformOptions>(std::string("add_platform_options"));
+        add_platform_options(*this->program_options);
+    }
+    catch(...)
+    {
+        // We don't actually care at this point if this failed.
+        // Maybe we've been pointed at the wrong place. Maybe this platform doesn't actually
+        // *have* platform-specific options.
+        // Regardless, if we need a platform and can't find one then we'll bail later
+        // in startup with a useful error.
+    }
 }
 
 boost::program_options::options_description_easy_init mo::DefaultConfiguration::add_options()

=== modified file 'src/platform/symbols.map'
--- src/platform/symbols.map	2014-11-27 03:48:20 +0000
+++ src/platform/symbols.map	2014-11-27 07:32:44 +0000
@@ -92,6 +92,7 @@
     mir::graphics::InternalSurface::pixel_format*;
     mir::graphics::InternalSurface::size*;
     mir::graphics::InternalSurface::swap_buffers*;
+    mir::graphics::module_for_device*;
     mir::graphics::NativePlatform::connection_ipc_package*;
     mir::graphics::NativePlatform::create_buffer_allocator*;
     mir::graphics::NativePlatform::fill_buffer_package*;
@@ -147,6 +148,7 @@
     mir::options::glog_log_dir*;
     mir::options::glog_minloglevel*;
     mir::options::glog_stderrthreshold*;
+    mir::options::platform_graphics_path*;
     mir::options::host_socket_opt*;
     mir::options::input_report_opt*;
     mir::options::legacy_input_report_opt*;

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2014-11-27 03:48:20 +0000
+++ src/server/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -8,6 +8,9 @@
   ${GLIB_INCLUDE_DIRS}
 )
 
+add_definitions(-DMIR_SERVER_PLATFORM_PLUGIN_PATH="${MIR_SERVER_PLATFORM_PLUGIN_PATH}")
+add_definitions(-DSERVER_PLATFORM_VERSION="${SERVER_PLATFORM_VERSION}")
+
 add_subdirectory(compositor/)
 add_subdirectory(graphics/)
 add_subdirectory(input/)
@@ -71,8 +74,9 @@
 )
 
 target_link_libraries(mirserver LINK_PUBLIC
+
+  mirclient
   mirplatform
-  mirclient
   mircommon
   mirprotobuf
   3rd_party

=== modified file 'src/server/graphics/CMakeLists.txt'
--- src/server/graphics/CMakeLists.txt	2014-11-24 02:16:00 +0000
+++ src/server/graphics/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -1,4 +1,4 @@
-include_directories(${GLESv2_INCLUDE_DIRS})
+include_directories(${GLESv2_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR})
 
 add_library(
   mirgraphics OBJECT

=== modified file 'src/server/graphics/default_configuration.cpp'
--- src/server/graphics/default_configuration.cpp	2014-11-27 03:48:20 +0000
+++ src/server/graphics/default_configuration.cpp	2014-11-27 07:32:44 +0000
@@ -28,12 +28,14 @@
 
 #include "mir/graphics/gl_config.h"
 #include "mir/graphics/cursor.h"
+#include "src/platform/graphics/platform_probe.h"
 #include "program_factory.h"
 
 #include "mir/shared_library.h"
-#include "mir/shared_library_loader.h"
+#include "mir/shared_library_prober.h"
 #include "mir/abnormal_exit.h"
 #include "mir/emergency_cleanup.h"
+#include "mir/logging/logger.h"
 
 #include "mir_toolkit/common.h"
 
@@ -44,6 +46,12 @@
 namespace mg = mir::graphics;
 namespace mgn = mir::graphics::nested;
 
+namespace
+{
+// TODO: Temporary, until we actually manage module lifetimes
+static std::shared_ptr<mir::SharedLibrary> platform_library;
+}
+
 std::shared_ptr<mg::DisplayConfigurationPolicy>
 mir::DefaultServerConfiguration::the_display_configuration_policy()
 {
@@ -62,6 +70,32 @@
     return wrapped;
 }
 
+namespace
+{
+namespace ml = mir::logging;
+
+class LoggingSharedLibraryReport : public mir::SharedLibraryProberReport
+{
+public:
+    void probing_path(boost::filesystem::path const& path) override
+    {
+        ml::log(ml::Severity::informational, std::string{"Scanning for platform libraries in "} + path.c_str(), "Platform Loader");
+    }
+    void probing_failed(boost::filesystem::path const& path, std::exception const& error) override
+    {
+        ml::log(ml::Severity::warning, std::string{"Failed to scan "} + path.c_str() + ": " + error.what(), "Platform Loader");
+    }
+    void loading_library(boost::filesystem::path const& filename) override
+    {
+        ml::log(ml::Severity::informational, std::string{"Loading library "} + filename.c_str(), "Platform Loader");
+    }
+    void loading_failed(boost::filesystem::path const& filename, std::exception const& error) override
+    {
+        ml::log(ml::Severity::warning, std::string{"Failed to load "} + filename.c_str() + ": " + error.what(), "Platform Loader");
+    }
+};
+}
+
 
 std::shared_ptr<mg::Platform> mir::DefaultServerConfiguration::the_graphics_platform()
 {
@@ -71,8 +105,22 @@
             if (!the_options()->is_set(options::host_socket_opt))
             {
                 // fallback to standalone if host socket is unset
-                auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib));
-                auto create_platform = graphics_lib->load_function<mg::CreatePlatform>("create_platform");
+                if (the_options()->is_set(options::platform_graphics_lib))
+                {
+                    platform_library = std::make_shared<mir::SharedLibrary>(the_options()->get<std::string>(options::platform_graphics_lib));
+                }
+                else
+                {
+                    LoggingSharedLibraryReport report;
+                    auto platforms = mir::libraries_for_path(the_options()->get<std::string>(options::platform_graphics_path), report);
+                    if (platforms.empty())
+                    {
+                        throw std::runtime_error("Failed to find any platform plugins in: " MIR_SERVER_PLATFORM_PLUGIN_PATH);
+                    }
+                    platform_library = mir::graphics::module_for_device(platforms);
+                }
+                auto create_platform = platform_library->load_function<mg::CreatePlatform>("create_platform",
+                                                                                           SERVER_PLATFORM_VERSION);
                 return create_platform(the_options(), the_emergency_cleanup(), the_display_report());
             }
 
@@ -121,8 +169,23 @@
     return graphics_native_platform(
         [this]()
         {
-            auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib));
-            auto create_native_platform = graphics_lib->load_function<mg::CreateNativePlatform>("create_native_platform");
+            if (the_options()->is_set(options::platform_graphics_lib))
+            {
+                platform_library = std::make_shared<mir::SharedLibrary>(the_options()->get<std::string>(options::platform_graphics_lib));
+            }
+            else
+            {
+                LoggingSharedLibraryReport report;
+                auto platforms = mir::libraries_for_path(the_options()->get<std::string>(options::platform_graphics_path), report);
+                if (platforms.empty())
+                {
+                    throw std::runtime_error("Failed to find any platform plugins in: " MIR_SERVER_PLATFORM_PLUGIN_PATH);
+                }
+                platform_library = mir::graphics::module_for_device(platforms);
+            }
+            auto create_native_platform = platform_library->load_function<mg::CreateNativePlatform>("create_native_platform",
+                                                                                                    SERVER_PLATFORM_VERSION);
+
             auto context = std::make_shared<MirConnectionNestedContext>(the_host_connection());
             return create_native_platform(the_display_report(), context);
         });

=== modified file 'src/server/server.cpp'
--- src/server/server.cpp	2014-11-21 09:49:05 +0000
+++ src/server/server.cpp	2014-11-27 07:32:44 +0000
@@ -186,7 +186,7 @@
     {
         auto const graphics_lib = the_options()->get<std::string>(options::platform_graphics_lib);
 
-        if (graphics_lib != "libmirplatformstub.so")
+        if (graphics_lib.find("graphics-dummy.so") == std::string::npos)
             return mir::DefaultServerConfiguration::the_renderer_factory();
         else
             return std::make_shared<StubRendererFactory>();

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2014-11-27 03:48:20 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -4,11 +4,6 @@
   ${CMAKE_SOURCE_DIR}
 )
 
-add_definitions(
-  -DMIR_PLATFORM_DRIVER_BINARY="${MIR_PLATFORM_DRIVER_BINARY}"
-  -DMIR_CLIENT_DRIVER_BINARY="${MIR_CLIENT_DRIVER_BINARY}"
-)
-
 set(
   SOURCES
 

=== modified file 'tests/acceptance-tests/server_configuration_wrapping.cpp'
--- tests/acceptance-tests/server_configuration_wrapping.cpp	2014-11-06 03:56:24 +0000
+++ tests/acceptance-tests/server_configuration_wrapping.cpp	2014-11-27 07:32:44 +0000
@@ -21,11 +21,14 @@
 
 #include "mir_test_framework/headless_test.h"
 
+#include "mir_test_framework/executable_path.h"
+
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
 namespace ms = mir::scene;
 namespace msh = mir::shell;
+namespace mtf = mir_test_framework;
 
 using namespace testing;
 

=== modified file 'tests/acceptance-tests/test_symbols_required_by_mesa.cpp'
--- tests/acceptance-tests/test_symbols_required_by_mesa.cpp	2014-11-24 02:16:00 +0000
+++ tests/acceptance-tests/test_symbols_required_by_mesa.cpp	2014-11-27 07:32:44 +0000
@@ -21,11 +21,14 @@
 
 #include <dlfcn.h>
 
+#include "mir_test_framework/executable_path.h"
+
 using namespace testing;
+namespace mtf = mir_test_framework;
 
-TEST(SymbolsRequiredByMesa, are_exported_by_libmirclientplatform)
+TEST(SymbolsRequiredByMesa, are_exported_by_client_platform_mesa)
 {
-    auto const handle = dlopen(MIR_CLIENT_DRIVER_BINARY, RTLD_LAZY);
+    auto const handle = dlopen((mtf::library_path() + "/client-modules/mesa.so").c_str(), RTLD_LAZY);
     ASSERT_THAT(handle, NotNull());
 
     auto const sym = dlsym(handle, "mir_client_mesa_egl_native_display_is_valid");
@@ -36,7 +39,7 @@
 
 TEST(SymbolsRequiredByMesa, are_exported_by_libmirplatformgraphics)
 {
-    auto const handle = dlopen(MIR_PLATFORM_DRIVER_BINARY, RTLD_LAZY);
+    auto const handle = dlopen((mtf::library_path() + "/server-modules/graphics-mesa.so").c_str(), RTLD_LAZY);
     ASSERT_THAT(handle, NotNull());
 
     auto const sym = dlsym(handle, "mir_server_mesa_egl_native_display_is_valid");

=== modified file 'tests/include/mir_test_doubles/mock_android_alloc_device.h'
--- tests/include/mir_test_doubles/mock_android_alloc_device.h	2013-06-18 08:00:49 +0000
+++ tests/include/mir_test_doubles/mock_android_alloc_device.h	2014-11-27 07:32:44 +0000
@@ -19,7 +19,11 @@
 #define MIR_TEST_DOUBLES_MOCK_ANDROID_ALLOC_DEVICE_H_
 
 #include <gmock/gmock.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <hardware/gralloc.h>
+#pragma GCC diagnostic pop
 
 namespace mir
 {

=== modified file 'tests/include/mir_test_doubles/mock_client_context.h'
--- tests/include/mir_test_doubles/mock_client_context.h	2013-04-24 05:22:20 +0000
+++ tests/include/mir_test_doubles/mock_client_context.h	2014-11-27 07:32:44 +0000
@@ -33,18 +33,12 @@
 struct MockClientContext : public client::ClientContext
 {
     MockClientContext()
-        : connection{reinterpret_cast<MirConnection*>(0xabcdef)}
     {
         using namespace testing;
 
-        ON_CALL(*this, mir_connection()).WillByDefault(Return(connection));
-        EXPECT_CALL(*this, mir_connection()).Times(AtLeast(0));
         EXPECT_CALL(*this, populate(_)).Times(AtLeast(0));
     }
 
-    MirConnection* connection;
-
-    MOCK_METHOD0(mir_connection, MirConnection*());
     MOCK_METHOD1(populate, void(MirPlatformPackage&));
 };
 

=== modified file 'tests/include/mir_test_doubles/mock_hwc_composer_device_1.h'
--- tests/include/mir_test_doubles/mock_hwc_composer_device_1.h	2014-03-27 06:27:59 +0000
+++ tests/include/mir_test_doubles/mock_hwc_composer_device_1.h	2014-11-27 07:32:44 +0000
@@ -19,7 +19,12 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_HWC_COMPOSER_DEVICE_1_H_
 #define MIR_TEST_DOUBLES_MOCK_HWC_COMPOSER_DEVICE_1_H_
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <hardware/hwcomposer.h>
+#pragma GCC diagnostic pop
+
 #include <gmock/gmock.h>
 
 namespace mir

=== added file 'tests/include/mir_test_framework/client_platform_factory.h'
--- tests/include/mir_test_framework/client_platform_factory.h	1970-01-01 00:00:00 +0000
+++ tests/include/mir_test_framework/client_platform_factory.h	2014-11-27 07:32:44 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_TEST_FRAMEWORK_CLIENT_PLATFORM_FACTORY_H_
+#define MIR_TEST_FRAMEWORK_CLIENT_PLATFORM_FACTORY_H_
+
+
+#include "mir/shared_library.h"
+#include "src/client/client_platform_factory.h"
+#include "executable_path.h"
+#include "mir_test_doubles/mock_client_context.h"
+
+namespace mtd = mir::test::doubles;
+
+namespace mir_test_framework
+{
+std::shared_ptr<mir::SharedLibrary> platform_library;
+
+std::shared_ptr<mir::client::ClientPlatform> create_android_client_platform()
+{
+    using namespace testing;
+    mtd::MockClientContext ctx;
+    ON_CALL(ctx, populate(_))
+        .WillByDefault(Invoke([](MirPlatformPackage& package) { ::memset(&package, 0, sizeof(package)); }));
+    platform_library = std::make_shared<mir::SharedLibrary>(library_path() + "/client-modules/android.so");
+    auto platform_factory = platform_library->load_function<mir::client::CreateClientPlatform>("create_client_platform");
+    return platform_factory(&ctx);
+}
+
+std::shared_ptr<mir::client::ClientPlatform> create_mesa_client_platform()
+{
+    using namespace testing;
+    mtd::MockClientContext ctx;
+    ON_CALL(ctx, populate(_))
+        .WillByDefault(Invoke([](MirPlatformPackage& package)
+                              {
+                                  ::memset(&package, 0, sizeof(package));
+                                  package.fd_items = 1;
+                              }));
+    platform_library = std::make_shared<mir::SharedLibrary>(library_path() + "/client-modules/mesa.so");
+    auto platform_factory = platform_library->load_function<mir::client::CreateClientPlatform>("create_client_platform");
+    return platform_factory(&ctx);
+}
+
+std::shared_ptr<mir::SharedLibrary>
+get_platform_library()
+{
+    if (!platform_library)
+    {
+        throw std::logic_error{"Must call one of create_*_client_platform() before calling get_platform_library()"};
+    }
+    return platform_library;
+}
+
+}
+
+#endif // MIR_TEST_FRAMEWORK_CLIENT_PLATFORM_FACTORY_H_

=== added file 'tests/include/mir_test_framework/stub_client_platform_factory.h'
--- tests/include/mir_test_framework/stub_client_platform_factory.h	1970-01-01 00:00:00 +0000
+++ tests/include/mir_test_framework/stub_client_platform_factory.h	2014-11-27 07:32:44 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_FACTORY_
+#define MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_FACTORY_
+
+#include "src/client/client_platform_factory.h"
+
+namespace mir_test_framework
+{
+
+struct StubClientPlatformFactory : public mir::client::ClientPlatformFactory
+{
+    std::shared_ptr<mir::client::ClientPlatform> create_client_platform(mir::client::ClientContext* context) override;
+};
+
+}
+#endif /* MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_ */

=== added file 'tests/include/mir_test_framework/stub_server_platform_factory.h'
--- tests/include/mir_test_framework/stub_server_platform_factory.h	1970-01-01 00:00:00 +0000
+++ tests/include/mir_test_framework/stub_server_platform_factory.h	2014-11-27 07:32:44 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_TEST_FRAMEWORK_STUB_SERVER_PLATFORM_FACTORY_
+#define MIR_TEST_FRAMEWORK_STUB_SERVER_PLATFORM_FACTORY_
+
+#include "mir/geometry/rectangle.h"
+
+#include "mir/graphics/platform.h"
+#include <vector>
+
+namespace geom = mir::geometry;
+
+namespace mir
+{
+namespace graphics
+{
+class Platform;
+}
+}
+
+namespace mg = mir::graphics;
+
+namespace mir_test_framework
+{
+
+std::shared_ptr<mg::Platform> make_stubbed_server_graphics_platform(std::vector<geom::Rectangle> const& display_rects);
+
+}
+#endif /* MIR_TEST_FRAMEWORK_STUB_SERVER_PLATFORM_FACTORY_ */

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2014-11-27 03:48:20 +0000
+++ tests/integration-tests/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -99,6 +99,15 @@
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARY}
   ${GMOCK_MAIN_LIBRARY}
+  # Mesa platform dependencies
+  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
+  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
+  # Android platform dependencies
+  ${LIBHARDWARE_LIBRARIES}
+  ${ANDROID_PROPERTIES_LIBRARIES}
+  # Shared platform dependencies
+  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
+  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
   ${GBM_LDFLAGS} ${GBM_LIBRARIES}
@@ -108,7 +117,7 @@
   ${MIR_SERVER_REFERENCES}
 )
 
-if (MIR_TEST_PLATFORM STREQUAL "android")
+if (MIR_BUILD_PLATFORM_ANDROID)
 target_link_libraries(mir_integration_tests
   mirsharedandroid
   ${ANDROID_PROPERTIES_LDFLAGS}
@@ -122,8 +131,18 @@
   "MIR_BUILD_INTEGRATION_TESTS"
   OFF)
 
+set (MIR_CLIENT_MODULE "client-modules/dummy.so")
+
+if (MIR_TEST_PLATFORM STREQUAL "android")
+  # Android platform integration tests have Android-specific tests
+  # requiring a real platform
+  set (MIR_CLIENT_MODULE "client-modules/android.so")
+endif()
+
 if (MIR_RUN_INTEGRATION_TESTS)
-  mir_discover_tests(mir_integration_tests)
+  mir_discover_tests(mir_integration_tests
+    MIR_CLIENT_PLATFORM_LIB=${LIBRARY_OUTPUT_PATH}/${MIR_CLIENT_MODULE}
+  )
 endif (MIR_RUN_INTEGRATION_TESTS)
 
 install(

=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
--- tests/mir_test_doubles/CMakeLists.txt	2014-11-24 02:16:00 +0000
+++ tests/mir_test_doubles/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -30,16 +30,19 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl.cpp
 )
 
-if (MIR_TEST_PLATFORM STREQUAL "mesa")
-include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
-list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/mock_gbm.cpp
-)
-elseif (MIR_TEST_PLATFORM STREQUAL "android")
-list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/mock_android_hw.cpp
-)
+if (MIR_BUILD_PLATFORM_MESA)
+  include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
+  list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gbm.cpp
+  )
+endif()
+
+if (MIR_BUILD_PLATFORM_ANDROID)
+  include_directories(${ANDROID_HEADERS_INCLUDE_DIRS})
+  list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_android_hw.cpp
+  )
 endif()
 
 add_library(

=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt	2014-11-24 02:16:00 +0000
+++ tests/mir_test_framework/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -4,10 +4,11 @@
   ${PROJECT_SOURCE_DIR}/src/include/common
   ${PROJECT_SOURCE_DIR}/src/include/server
   ${PROJECT_SOURCE_DIR}/src/include/client
-    ${Boost_INCLUDE_DIRS}
-    ${GLESv2_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}
-    ${UMOCKDEV_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
+  ${GLESv2_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}
+  ${UMOCKDEV_INCLUDE_DIRS}
+  ${ANDROID_HEADERS_INCLUDE_DIRS}
 )
 
 set(
@@ -31,6 +32,8 @@
   display_server_test_fixture.cpp
   process.cpp
   using_stub_client_platform.cpp
+  stub_client_platform_factory.cpp
+  stub_server_platform_factory.cpp
   udev_environment.cpp
   declarative_placement_strategy.cpp
   fake_event_hub_server_configuration.cpp
@@ -55,7 +58,6 @@
 target_link_libraries(
   mir-test-framework
 
-  mirplatformstub
   3rd_party
 
   ${PROTOBUF_LIBRARIES}
@@ -67,6 +69,53 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
+set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols-client.map)
+
+add_library(
+  mirclientplatformstub MODULE
+
+  stub_client_platform_module.cpp
+)
+
+target_link_libraries(
+  mirclientplatformstub
+
+  mir-test-framework
+  ${UMOCKDEV_LDFLAGS} ${UMOCKDEV_LIBRARIES}
+)
+
+set_target_properties(
+  mirclientplatformstub PROPERTIES;
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/client-modules
+  OUTPUT_NAME dummy
+  PREFIX ""
+  LINK_FLAGS "-Wl,--version-script,${symbol_map}"
+)
+install(TARGETS mirclientplatformstub LIBRARY DESTINATION ${MIR_CLIENT_PLATFORM_PATH})
+
+set(server_symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols-server.map)
+add_library(
+  mirplatformgraphicsstub MODULE
+
+  platform_graphics_dummy.cpp
+  stubbed_graphics_platform.cpp
+)
+
+target_link_libraries(
+  mirplatformgraphicsstub
+
+  mir-test-framework
+)
+
+set_target_properties(
+  mirplatformgraphicsstub PROPERTIES;
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/server-modules
+  OUTPUT_NAME graphics-dummy
+  PREFIX ""
+  LINK_FLAGS "-Wl,--version-script,${server_symbol_map}"
+)
+install(TARGETS mirplatformgraphicsstub LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PLUGIN_PATH})
+
 add_custom_command(TARGET mir-test-framework POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory
   ${CMAKE_CURRENT_SOURCE_DIR}/udev_recordings ${CMAKE_BINARY_DIR}/bin/udev_recordings
@@ -79,19 +128,3 @@
 )
 
 string (REPLACE " -Wl,--no-undefined" " " CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS})
-
-add_library(
-  mirplatformstub SHARED
-  stubbed_graphics_platform.cpp
-)
-
-target_link_libraries(mirplatformstub 
-  mir-test-doubles
-)
-
-set_target_properties(mirplatformstub
-  PROPERTIES
-  LINK_FLAGS "-Wl,--exclude-libs=ALL"
-)
-
-install(TARGETS mirplatformstub LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

=== modified file 'tests/mir_test_framework/headless_test.cpp'
--- tests/mir_test_framework/headless_test.cpp	2014-11-25 12:05:51 +0000
+++ tests/mir_test_framework/headless_test.cpp	2014-11-27 07:32:44 +0000
@@ -25,6 +25,7 @@
 #include "mir/geometry/rectangle.h"
 #include "mir/options/option.h"
 #include "mir_test_doubles/null_logger.h"
+#include "mir_test_framework/executable_path.h"
 
 #include <boost/throw_exception.hpp>
 
@@ -35,15 +36,24 @@
 
 namespace
 {
+<<<<<<< TREE
 const char* const mir_server_platform_graphics_lib = "MIR_SERVER_PLATFORM_GRAPHICS_LIB";
 
 std::chrono::seconds const timeout{10};
+=======
+std::chrono::seconds const timeout{100000};
+>>>>>>> MERGE-SOURCE
 }
 
 mtf::HeadlessTest::HeadlessTest()
 {
     configure_from_commandline(server);
+<<<<<<< TREE
     add_to_environment(mir_server_platform_graphics_lib, "libmirplatformstub.so");
+=======
+    add_to_environment("MIR_SERVER_PLATFORM_GRAPHICS_LIB", (mtf::library_path() + "/server-modules/graphics-dummy.so").c_str());
+    add_to_environment("MIR_CLIENT_PLATFORM_PATH", (mtf::library_path() + "/client-modules/").c_str());
+>>>>>>> MERGE-SOURCE
     server.add_configuration_option(mtd::logging_opt, mtd::logging_descr, false);
     server.override_the_logger([&]()
         {

=== added file 'tests/mir_test_framework/platform_graphics_dummy.cpp'
--- tests/mir_test_framework/platform_graphics_dummy.cpp	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/platform_graphics_dummy.cpp	2014-11-27 07:32:44 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>>
+ */
+
+#include "mir/graphics/platform.h"
+
+extern "C" mir::graphics::PlatformPriority probe_platform()
+{
+    return mir::graphics::supported;
+}
+
+mir::graphics::ModuleProperties const description {
+    "dummy"
+};
+
+extern "C" mir::graphics::ModuleProperties const* describe_module()
+{
+    return &description;
+}

=== added file 'tests/mir_test_framework/stub_client_platform_factory.cpp'
--- tests/mir_test_framework/stub_client_platform_factory.cpp	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/stub_client_platform_factory.cpp	2014-11-27 07:32:44 +0000
@@ -0,0 +1,147 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "mir_test_framework/stub_client_platform_factory.h"
+#include "src/client/client_buffer_factory.h"
+#include "src/client/client_buffer.h"
+#include "src/client/client_platform.h"
+
+#include <string.h>
+
+namespace mcl = mir::client;
+namespace geom = mir::geometry;
+namespace mtf = mir_test_framework;
+
+namespace
+{
+class StubClientBuffer : public mcl::ClientBuffer
+{
+public:
+    StubClientBuffer(std::shared_ptr<MirBufferPackage> const& package)
+    {
+        static_cast<void>(package);
+#ifndef ANDROID
+        native = package;
+#endif
+    }
+
+    std::shared_ptr<mcl::MemoryRegion> secure_for_cpu_write()
+    {
+        return nullptr;
+    }
+
+    geom::Size size() const
+    {
+        return geom::Size{};
+    }
+
+    geom::Stride stride() const
+    {
+        return geom::Stride{};
+    }
+
+    MirPixelFormat pixel_format() const
+    {
+        return mir_pixel_format_abgr_8888;
+    }
+
+    uint32_t age() const
+    {
+        return 0;
+    }
+    void increment_age()
+    {
+    }
+    void mark_as_submitted()
+    {
+    }
+    std::shared_ptr<mir::graphics::NativeBuffer> native_buffer_handle() const
+    {
+#ifdef ANDROID
+        return nullptr;
+#else
+        return native;
+#endif
+    }
+    void update_from(MirBufferPackage const& package) override
+    {
+        static_cast<void>(package);
+#ifndef ANDROID
+        ::memcpy(native.get(), &package, sizeof(package));
+#endif
+    }
+private:
+#ifndef ANDROID
+    std::shared_ptr<mir::graphics::NativeBuffer> native;
+#endif
+
+    virtual void fill_update_msg(MirBufferPackage& /*message*/) override
+    {
+    }
+};
+
+struct StubClientBufferFactory : public mcl::ClientBufferFactory
+{
+    std::shared_ptr<mcl::ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const& package,
+                                                     geom::Size, MirPixelFormat)
+    {
+        return std::make_shared<StubClientBuffer>(package);
+    }
+};
+
+struct StubClientPlatform : public mcl::ClientPlatform
+{
+    MirPlatformType platform_type() const
+    {
+        return mir_platform_type_gbm;
+    }
+
+    std::shared_ptr<mcl::ClientBufferFactory> create_buffer_factory()
+    {
+        return std::make_shared<StubClientBufferFactory>();
+    }
+
+    std::shared_ptr<EGLNativeWindowType> create_egl_native_window(mcl::ClientSurface*)
+    {
+        auto fake_window = reinterpret_cast<EGLNativeWindowType>(0x12345678lu);
+        return std::make_shared<EGLNativeWindowType>(fake_window);
+    }
+
+    std::shared_ptr<EGLNativeDisplayType> create_egl_native_display()
+    {
+        auto fake_display = reinterpret_cast<EGLNativeDisplayType>(0x12345678lu);
+        return std::make_shared<EGLNativeDisplayType>(fake_display);
+    }
+
+    MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer* buf) const
+    {
+        static_cast<void>(buf);
+#ifndef ANDROID
+        return buf;
+#else
+        return nullptr;
+#endif
+    }
+};
+}
+
+std::shared_ptr<mcl::ClientPlatform>
+mtf::StubClientPlatformFactory::create_client_platform(mcl::ClientContext*)
+{
+    return std::make_shared<StubClientPlatform>();
+}

=== added file 'tests/mir_test_framework/stub_client_platform_module.cpp'
--- tests/mir_test_framework/stub_client_platform_module.cpp	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/stub_client_platform_module.cpp	2014-11-27 07:32:44 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>>
+ */
+
+#include "src/client/client_platform_factory.h"
+
+#include "mir_test_framework/stub_client_platform_factory.h"
+#include <memory>
+
+namespace mtf = mir_test_framework;
+namespace mcl = mir::client;
+
+extern "C" std::shared_ptr<mcl::ClientPlatform> create_client_platform(mcl::ClientContext* context)
+{
+    return mtf::StubClientPlatformFactory{}.create_client_platform(context);
+}
+
+extern "C" bool is_appropriate_module(mcl::ClientContext* /*context*/)
+{
+    return true;
+}

=== added file 'tests/mir_test_framework/stub_server_platform_factory.cpp'
--- tests/mir_test_framework/stub_server_platform_factory.cpp	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/stub_server_platform_factory.cpp	2014-11-27 07:32:44 +0000
@@ -0,0 +1,54 @@
+
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "mir/shared_library.h"
+
+#include "mir/geometry/rectangle.h"
+
+#include "mir_test_framework/executable_path.h"
+#include "mir_test_framework/stub_server_platform_factory.h"
+
+#include <vector>
+
+namespace geom = mir::geometry;
+namespace mg = mir::graphics;
+namespace mtf = mir_test_framework;
+
+namespace
+{
+// NOTE: Raw pointer, deliberately leaked to bypass all the fun
+//       issues around global destructor ordering.
+mir::SharedLibrary* platform_lib{nullptr};
+
+void ensure_platform_library()
+{
+    if (!platform_lib)
+    {
+        platform_lib = new mir::SharedLibrary{mtf::library_path() + "/server-modules/graphics-dummy.so"};
+    }
+}
+}
+
+std::shared_ptr<mg::Platform> mtf::make_stubbed_server_graphics_platform(std::vector<geom::Rectangle> const& display_rects)
+{
+    ensure_platform_library();
+    auto factory = platform_lib->load_function<std::shared_ptr<mg::Platform>(*)(std::vector<geom::Rectangle> const&)>("create_stub_platform");
+
+    return factory(display_rects);
+}

=== modified file 'tests/mir_test_framework/stubbed_graphics_platform.cpp'
--- tests/mir_test_framework/stubbed_graphics_platform.cpp	2014-11-25 12:05:51 +0000
+++ tests/mir_test_framework/stubbed_graphics_platform.cpp	2014-11-27 07:32:44 +0000
@@ -191,16 +191,25 @@
     return std::make_shared<NullWriter>();
 }
 
+<<<<<<< TREE
 namespace
 {
 std::unique_ptr<std::vector<geom::Rectangle>> chosen_display_rects;
 }
 
+=======
+extern "C" std::shared_ptr<mg::Platform> create_stub_platform(std::vector<geom::Rectangle> const& display_rects)
+{
+    return std::make_shared<mtf::StubGraphicPlatform>(display_rects);
+}
+
+>>>>>>> MERGE-SOURCE
 extern "C" std::shared_ptr<mg::Platform> create_platform(
     std::shared_ptr<mo::Option> const& /*options*/,
     std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
     std::shared_ptr<mg::DisplayReport> const& /*report*/)
 {
+<<<<<<< TREE
     if (auto const display_rects = std::move(chosen_display_rects))
     {
         return std::make_shared<mtf::StubGraphicPlatform>(*display_rects);
@@ -210,6 +219,10 @@
         static std::vector<geom::Rectangle> const default_display_rects{geom::Rectangle{{0,0},{1600,1600}}};
         return std::make_shared<mtf::StubGraphicPlatform>(default_display_rects);
     }
+=======
+    static std::vector<geom::Rectangle> const display_rects{geom::Rectangle{{0,0},{1600,1600}}};
+    return create_stub_platform(display_rects);
+>>>>>>> MERGE-SOURCE
 }
 
 extern "C" void add_platform_options(

=== modified file 'tests/mir_test_framework/stubbed_server_configuration.cpp'
--- tests/mir_test_framework/stubbed_server_configuration.cpp	2014-11-24 02:16:00 +0000
+++ tests/mir_test_framework/stubbed_server_configuration.cpp	2014-11-27 07:32:44 +0000
@@ -19,7 +19,7 @@
 #include "mir_test_framework/stubbed_server_configuration.h"
 #include "mir_test_framework/command_line_server_configuration.h"
 
-#include "stubbed_graphics_platform.h"
+#include "mir_test_framework/stub_server_platform_factory.h"
 
 #include "mir/options/default_configuration.h"
 #include "mir/graphics/cursor.h"
@@ -92,7 +92,7 @@
 {
     if (!graphics_platform)
     {
-        graphics_platform = std::make_shared<StubGraphicPlatform>(display_rects);
+        graphics_platform = mtf::make_stubbed_server_graphics_platform(display_rects);
     }
 
     return graphics_platform;

=== added file 'tests/mir_test_framework/symbols-client.map'
--- tests/mir_test_framework/symbols-client.map	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/symbols-client.map	2014-11-27 07:32:44 +0000
@@ -0,0 +1,7 @@
+MIR_CLIENT_PLATFORM_2 {
+  global: 
+    create_client_platform;
+    is_appropriate_module;
+  local:
+    *;
+};

=== added file 'tests/mir_test_framework/symbols-server.map'
--- tests/mir_test_framework/symbols-server.map	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/symbols-server.map	2014-11-27 07:32:44 +0000
@@ -0,0 +1,8 @@
+MIR_GRAPHICS_PLATFORM_1 {
+  global:
+    add_platform_options;
+    create_platform;
+    create_native_platform;
+    probe_platform;
+    describe_module;
+};

=== modified file 'tests/mir_test_framework/testing_client_options.cpp'
--- tests/mir_test_framework/testing_client_options.cpp	2014-11-27 03:48:20 +0000
+++ tests/mir_test_framework/testing_client_options.cpp	2014-11-27 07:32:44 +0000
@@ -16,18 +16,17 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "mir_test_framework/testing_client_configuration.h"
 #include "mir_test_framework/stub_client_connection_configuration.h"
+<<<<<<< TREE
 #include "mir_test_doubles/stub_client_buffer_factory.h"
 #include "mir/options/program_option.h"
+=======
+>>>>>>> MERGE-SOURCE
 #include "src/client/default_connection_configuration.h"
-#include "src/client/client_platform_factory.h"
-#include "src/client/client_buffer_factory.h"
-#include "src/client/client_buffer.h"
-#include "src/client/client_platform.h"
-#include "src/client/mir_connection.h"
+#include "mir_test_framework/stub_client_platform_factory.h"
 
 namespace mcl = mir::client;
+<<<<<<< TREE
 namespace mtf=mir_test_framework;
 namespace geom = mir::geometry;
 namespace mtd = mir::test::doubles;
@@ -73,6 +72,9 @@
 };
 
 }
+=======
+namespace mtf = mir_test_framework;
+>>>>>>> MERGE-SOURCE
 
 mtf::StubConnectionConfiguration::StubConnectionConfiguration(std::string const& socket_file)
     : DefaultConnectionConfiguration(socket_file)

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2014-11-27 03:48:20 +0000
+++ tests/unit-tests/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -1,7 +1,23 @@
 include(CMakeDependentOption)
 
+add_definitions(-DTEST_RECORDINGS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/input_recordings/")
+
+if (MIR_BUILD_PLATFORM_ANDROID)
+  add_definitions(-DMIR_BUILD_PLATFORM_ANDROID)
+endif()
+
+if (MIR_BUILD_PLATFORM_MESA)
+  add_definitions(-DMIR_BUILD_PLATFORM_MESA)
+endif()
+
 include_directories(
   ${CMAKE_SOURCE_DIR}
+
+  ${ANDROID_HEADERS_INCLUDE_DIRS}
+  ${DRM_INCLUDE_DIRS}
+  ${GBM_INCLUDE_DIRS}
+  ${UMOCKDEV_INCLUDE_DIRS}
+
   ${PROJECT_SOURCE_DIR}/src/include/platform
   ${PROJECT_SOURCE_DIR}/src/include/server
   ${PROJECT_SOURCE_DIR}/src/include/client
@@ -9,12 +25,6 @@
   ${GLIB_INCLUDE_DIRS}
 )
 
-add_definitions(
-  -DTEST_RECORDINGS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/input_recordings/"
-  -DMIR_CLIENT_DRIVER_BINARY="${MIR_CLIENT_DRIVER_BINARY}"
-)
-
-include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${UMOCKDEV_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
 # TODO: Aim to remove
 include_directories(${MIR_XCURSOR_INCLUDE_DIRECTORIES})
 
@@ -79,9 +89,9 @@
   demo-shell
 
   mir-test
+  mir-test-framework
   mir-test-doubles
   mir-test-doubles-platform
-  mir-test-framework
 
   3rd_party
 
@@ -91,6 +101,15 @@
   ${GMOCK_MAIN_LIBRARY}
   ${Boost_LIBRARIES}
   ${UMOCKDEV_LIBRARIES}
+  # Mesa platform dependencies
+  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
+  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
+  # Android platform dependencies
+  ${LIBHARDWARE_LIBRARIES}
+  ${ANDROID_PROPERTIES_LIBRARIES}
+  # Shared platform dependencies
+  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
+  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
   ${LIBHARDWARE_LDFLAGS} ${LIBHARDWARE_LIBRARIES}
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
@@ -99,7 +118,7 @@
   ${MIR_SERVER_REFERENCES}
 )
 
-if (MIR_TEST_PLATFORM STREQUAL "android")
+if (MIR_BUILD_PLATFORM_ANDROID)
 target_link_libraries(mir_unit_tests 
   mirsharedandroid
   ${ANDROID_PROPERTIES_LDFLAGS}
@@ -114,7 +133,10 @@
   OFF)
 
 if (MIR_RUN_UNIT_TESTS)
-  mir_discover_tests(mir_unit_tests LD_PRELOAD=libumockdev-preload.so.0 G_SLICE=always-malloc G_DEBUG=gc-friendly)
+  mir_discover_tests(mir_unit_tests
+                       LD_PRELOAD=libumockdev-preload.so.0
+                       G_SLICE=always-malloc
+                       G_DEBUG=gc-friendly)
 endif (MIR_RUN_UNIT_TESTS)
 
 install(

=== modified file 'tests/unit-tests/client/CMakeLists.txt'
--- tests/unit-tests/client/CMakeLists.txt	2014-11-24 02:16:00 +0000
+++ tests/unit-tests/client/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -12,6 +12,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_protobuf_rpc_channel.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_mir_prompt_session.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_event_distributor.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_probing_client_platform_factory.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_periodic_perf_report.cpp
 )
 

=== modified file 'tests/unit-tests/client/android/test_android_client_platform.cpp'
--- tests/unit-tests/client/android/test_android_client_platform.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/android/test_android_client_platform.cpp	2014-11-27 07:32:44 +0000
@@ -17,9 +17,9 @@
  */
 
 #include "src/client/client_platform.h"
-#include "src/client/android/client_platform_factory.h"
 #include "mir_test_doubles/mock_client_context.h"
 #include "mir_test_doubles/mock_client_surface.h"
+#include "mir_test_framework/client_platform_factory.h"
 
 #include <EGL/egl.h>
 
@@ -28,13 +28,12 @@
 namespace mcl = mir::client;
 namespace mt = mir::test;
 namespace mtd = mt::doubles;
+namespace mtf = mir_test_framework;
 
 TEST(AndroidClientPlatformTest, egl_native_display_is_egl_default_display)
 {
-    mtd::MockClientContext context;
-    mcl::android::ClientPlatformFactory factory;
     mtd::MockClientSurface surface;
-    auto platform = factory.create_client_platform(&context);
+    auto platform = mtf::create_android_client_platform();
     auto mock_client_surface = std::make_shared<mtd::MockClientSurface>();
     auto native_display = platform->create_egl_native_display();
     EXPECT_EQ(EGL_DEFAULT_DISPLAY, *native_display);
@@ -42,10 +41,8 @@
 
 TEST(AndroidClientPlatformTest, egl_native_window_is_set)
 {
-    mtd::MockClientContext context;
-    mcl::android::ClientPlatformFactory factory;
     mtd::MockClientSurface surface;
-    auto platform = factory.create_client_platform(&context);
+    auto platform = mtf::create_android_client_platform();
     auto mock_client_surface = std::make_shared<mtd::MockClientSurface>();
     auto egl_native_window = platform->create_egl_native_window(&surface);
     EXPECT_NE(nullptr, egl_native_window);

=== modified file 'tests/unit-tests/client/mesa/test_client_platform.cpp'
--- tests/unit-tests/client/mesa/test_client_platform.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/mesa/test_client_platform.cpp	2014-11-27 07:32:44 +0000
@@ -17,9 +17,9 @@
  */
 
 #include "src/client/client_platform.h"
-#include "src/client/mesa/client_platform_factory.h"
+#include "mir/shared_library.h"
 #include "src/client/mesa/mesa_native_display_container.h"
-#include "mir_test_doubles/mock_client_context.h"
+#include "mir_test_framework/client_platform_factory.h"
 #include "mir_test_doubles/mock_client_surface.h"
 
 #include "mir_toolkit/mesa/native_display.h"
@@ -30,19 +30,20 @@
 namespace mclm = mir::client::mesa;
 namespace mt = mir::test;
 namespace mtd = mir::test::doubles;
+namespace mtf = mir_test_framework;
 
 TEST(MesaClientPlatformTest, egl_native_display_is_valid_until_released)
 {
-    mtd::MockClientContext context;
-    mclm::ClientPlatformFactory factory;
-    auto platform = factory.create_client_platform(&context);
+    auto platform = mtf::create_mesa_client_platform();
+    auto platform_lib = mtf::get_platform_library();
 
     MirMesaEGLNativeDisplay* nd;
     {
         std::shared_ptr<EGLNativeDisplayType> native_display = platform->create_egl_native_display();
 
         nd = reinterpret_cast<MirMesaEGLNativeDisplay*>(*native_display);
-        EXPECT_EQ(MIR_MESA_TRUE, mclm::mir_client_mesa_egl_native_display_is_valid(nd));
+        auto validate = platform_lib->load_function<MirBool(*)(MirMesaEGLNativeDisplay*)>("mir_client_mesa_egl_native_display_is_valid");
+        EXPECT_EQ(MIR_MESA_TRUE, validate(nd));
     }
     EXPECT_EQ(MIR_MESA_FALSE, mclm::mir_client_mesa_egl_native_display_is_valid(nd));
 }

=== modified file 'tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp'
--- tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp	2014-11-27 07:32:44 +0000
@@ -40,7 +40,7 @@
     }
 
     std::shared_ptr<mclg::MesaNativeDisplayContainer> const container;
-    MirConnection* connection;
+    mir::client::ClientContext* connection;
 };
 
 }

=== modified file 'tests/unit-tests/client/test_client_platform.cpp'
--- tests/unit-tests/client/test_client_platform.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/test_client_platform.cpp	2014-11-27 07:32:44 +0000
@@ -20,60 +20,140 @@
 #include "src/client/mir_client_surface.h"
 #include "mir_test_doubles/mock_client_context.h"
 #include "mir_test_doubles/mock_client_surface.h"
+#include "mir_test_framework/executable_path.h"
 
-#ifdef ANDROID
+#ifdef MIR_BUILD_PLATFORM_ANDROID
 #include "mir_test_doubles/mock_android_hw.h"
-#include "src/client/android/client_platform_factory.h"
-#else
-#include "src/client/mesa/client_platform_factory.h"
 #endif
 
+#include "src/client/client_platform_factory.h"
+
+#include "mir/shared_library.h"
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 namespace mcl=mir::client;
 namespace mtd = mir::test::doubles;
-
-struct ClientPlatformTest : public ::testing::Test
-{
+namespace mtf = mir_test_framework;
+
+namespace
+{
+struct ClientPlatformTraits
+{
+    ClientPlatformTraits(std::string const& library,
+                         std::function<void(MirPlatformPackage&)> populator,
+                         MirPlatformType type)
+        : platform_library_name{library},
+          populate_package_for{populator},
+          platform_type{type}
+    {
+    }
+
+    std::string const platform_library_name;
+    std::function<void(MirPlatformPackage&)> const populate_package_for;
+    MirPlatformType const platform_type;
+};
+
+struct ClientPlatformTest : public ::testing::TestWithParam<ClientPlatformTraits const*>
+{
+    ClientPlatformTest()
+        : platform_library{mtf::library_path() + "/" + GetParam()->platform_library_name},
+          create_client_platform{platform_library.load_function<mcl::CreateClientPlatform>("create_client_platform")},
+          probe{platform_library.load_function<mcl::ClientPlatformProbe>("is_appropriate_module")}
+    {
+        using namespace testing;
+        ON_CALL(context, populate(_))
+            .WillByDefault(Invoke(GetParam()->populate_package_for));
+    }
+
     mtd::MockClientContext context;
-#ifdef ANDROID
+#ifdef MIR_BUILD_PLATFORM_ANDROID
     testing::NiceMock<mtd::HardwareAccessMock> hw_access_mock;
-    mcl::android::ClientPlatformFactory factory;
-#else
-    mcl::mesa::ClientPlatformFactory factory;
 #endif
+    mir::SharedLibrary platform_library;
+    mcl::CreateClientPlatform const create_client_platform;
+    mcl::ClientPlatformProbe const probe;
 };
 
-TEST_F(ClientPlatformTest, platform_name)
-{
-    auto platform = factory.create_client_platform(&context);
-#ifdef ANDROID
-    auto type = mir_platform_type_android;
-#else
-    auto type = mir_platform_type_gbm;
-#endif
-    EXPECT_EQ(type, platform->platform_type());
-}
-
-TEST_F(ClientPlatformTest, platform_creates)
-{
-    auto platform = factory.create_client_platform(&context);
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+ClientPlatformTraits const android_platform{"/client-modules/android.so",
+                                            [](MirPlatformPackage& pkg)
+                                            {
+                                                ::memset(&pkg, 0, sizeof(pkg));
+                                            },
+                                            mir_platform_type_android
+                                           };
+
+INSTANTIATE_TEST_CASE_P(Android,
+                        ClientPlatformTest,
+                        ::testing::Values(&android_platform));
+
+#endif
+
+#ifdef MIR_BUILD_PLATFORM_MESA
+ClientPlatformTraits const mesa_platform{"/client-modules/mesa.so",
+                                         [](MirPlatformPackage& pkg)
+                                         {
+                                             ::memset(&pkg, 0, sizeof(pkg));
+                                             pkg.fd_items = 1;
+                                         },
+                                         mir_platform_type_gbm
+                                        };
+
+INSTANTIATE_TEST_CASE_P(Mesa,
+                        ClientPlatformTest,
+                        ::testing::Values(&mesa_platform));
+
+#endif
+}
+
+TEST_P(ClientPlatformTest, platform_name)
+{
+    auto platform = create_client_platform(&context);
+
+    EXPECT_EQ(GetParam()->platform_type, platform->platform_type());
+}
+
+TEST_P(ClientPlatformTest, platform_creates)
+{
+    auto platform = create_client_platform(&context);
     auto buffer_factory = platform->create_buffer_factory();
     EXPECT_NE(buffer_factory.get(), (mcl::ClientBufferFactory*) NULL);
 }
 
-TEST_F(ClientPlatformTest, platform_creates_native_window)
+TEST_P(ClientPlatformTest, platform_creates_native_window)
 {
-    auto platform = factory.create_client_platform(&context);
+    auto platform = create_client_platform(&context);
     auto mock_client_surface = std::make_shared<mtd::MockClientSurface>();
     auto native_window = platform->create_egl_native_window(mock_client_surface.get());
     EXPECT_NE(*native_window, (EGLNativeWindowType) NULL);
 }
 
-TEST_F(ClientPlatformTest, platform_creates_egl_native_display)
+TEST_P(ClientPlatformTest, platform_creates_egl_native_display)
 {
-    auto platform = factory.create_client_platform(&context);
+    auto platform = create_client_platform(&context);
     auto native_display = platform->create_egl_native_display();
     EXPECT_NE(nullptr, native_display.get());
 }
+
+TEST_P(ClientPlatformTest, platform_probe_returns_success_when_matching)
+{
+    EXPECT_TRUE(probe(&context));
+}
+
+TEST_P(ClientPlatformTest, platform_probe_returns_false_when_not_matching)
+{
+    using namespace testing;
+    ON_CALL(context, populate(_))
+        .WillByDefault(Invoke([](MirPlatformPackage& pkg)
+                              {
+                                  //Mock up something that hopefully looks nothing like
+                                  //what the platform is expecting...
+                                  ::memset(&pkg, 0, sizeof(pkg));
+                                  pkg.data_items = 0xdeadbeef;
+                                  pkg.fd_items = -23;
+                              }));
+
+    EXPECT_FALSE(probe(&context));
+}

=== added file 'tests/unit-tests/client/test_probing_client_platform_factory.cpp'
--- tests/unit-tests/client/test_probing_client_platform_factory.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/client/test_probing_client_platform_factory.cpp	2014-11-27 07:32:44 +0000
@@ -0,0 +1,141 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "src/client/client_platform.h"
+#include "src/client/probing_client_platform_factory.h"
+
+#include "mir_test_doubles/mock_client_context.h"
+#include "mir_test_framework/executable_path.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace mtf = mir_test_framework;
+namespace mtd = mir::test::doubles;
+
+namespace
+{
+std::vector<std::shared_ptr<mir::SharedLibrary>>
+all_available_modules()
+{
+    std::vector<std::shared_ptr<mir::SharedLibrary>> modules;
+#ifdef MIR_BUILD_PLATFORM_MESA
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-modules/mesa.so"));
+#endif
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-modules/android.so"));
+#endif
+    return modules;
+}
+}
+
+TEST(ProbingClientPlatformFactory, ThrowsErrorWhenConstructedWithNoPlatforms)
+{
+    std::vector<std::shared_ptr<mir::SharedLibrary>> empty_modules;
+    EXPECT_THROW(mir::client::ProbingClientPlatformFactory{empty_modules},
+                 std::runtime_error);
+}
+
+TEST(ProbingClientPlatformFactory, ThrowsErrorWhenNoPlatformPluginProbesSuccessfully)
+{
+    using namespace testing;
+
+    mir::client::ProbingClientPlatformFactory factory{all_available_modules()};
+
+    mtd::MockClientContext context;
+    ON_CALL(context, populate(_))
+            .WillByDefault(Invoke([](MirPlatformPackage& pkg)
+                           {
+                               ::memset(&pkg, 0, sizeof(MirPlatformPackage));
+                               // Mock up a platform package that looks nothing like
+                               // either an Android or Mesa package
+                               pkg.fd_items = 0xdeadbeef;
+                               pkg.data_items = -23;
+                           }));
+
+    EXPECT_THROW(factory.create_client_platform(&context),
+                 std::runtime_error);
+}
+
+#ifdef MIR_BUILD_PLATFORM_MESA
+TEST(ProbingClientPlatformFactory, CreatesMesaPlatformWhenAppropriate)
+{
+    using namespace testing;
+
+    mir::client::ProbingClientPlatformFactory factory{all_available_modules()};
+
+    mtd::MockClientContext context;
+    ON_CALL(context, populate(_))
+            .WillByDefault(Invoke([](MirPlatformPackage& pkg)
+                           {
+                               ::memset(&pkg, 0, sizeof(MirPlatformPackage));
+                               // Mock up something that looks like a GBM platform package,
+                               // until we send the actual platform type over the wire!
+                               pkg.fd_items = 1;
+                               pkg.fd[0] = 23;
+                           }));
+    auto platform = factory.create_client_platform(&context);
+    EXPECT_EQ(mir_platform_type_gbm, platform->platform_type());
+}
+#endif
+
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+TEST(ProbingClientPlatformFactory, CreatesAndroidPlatformWhenAppropriate)
+{
+    using namespace testing;
+
+    mir::client::ProbingClientPlatformFactory factory{all_available_modules()};
+
+    mtd::MockClientContext context;
+    ON_CALL(context, populate(_))
+            .WillByDefault(Invoke([](MirPlatformPackage& pkg)
+                           {
+                               // Mock up something that looks like a Android platform package,
+                               // until we send the actual platform type over the wire!
+                               ::memset(&pkg, 0, sizeof(MirPlatformPackage));
+                           }));
+
+    auto platform = factory.create_client_platform(&context);
+    EXPECT_EQ(mir_platform_type_android, platform->platform_type());
+}
+#endif
+
+TEST(ProbingClientPlatformFactory, IgnoresNonClientPlatformModules)
+{
+    using namespace testing;
+
+    auto modules = all_available_modules();
+    // NOTE: For minimum fuss, load something that has minimal side-effects...
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/server-modules/graphics-dummy.so"));
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-modules/dummy.so"));
+
+    mir::client::ProbingClientPlatformFactory factory{modules};
+
+    mtd::MockClientContext context;
+    ON_CALL(context, populate(_))
+            .WillByDefault(Invoke([](MirPlatformPackage& pkg)
+                           {
+                               // Mock up something that looks like a Dummy platform package,
+                               // until we send the actual platform type over the wire!
+                               ::memset(&pkg, 0, sizeof(MirPlatformPackage));
+                               pkg.data_items = 20;
+                               strcpy(reinterpret_cast<char*>(pkg.data), "Dummy platform");
+                           }));
+
+    auto platform = factory.create_client_platform(&context);
+}

=== modified file 'tests/unit-tests/graphics/CMakeLists.txt'
--- tests/unit-tests/graphics/CMakeLists.txt	2014-11-24 02:16:00 +0000
+++ tests/unit-tests/graphics/CMakeLists.txt	2014-11-27 07:32:44 +0000
@@ -10,6 +10,7 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/test_surfaceless_egl_context.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_overlapping_output_grouping.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_program_factory.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_prober.cpp
 )
 
 add_subdirectory(nested/)

=== modified file 'tests/unit-tests/graphics/android/test_platform.cpp'
--- tests/unit-tests/graphics/android/test_platform.cpp	2014-11-24 02:16:00 +0000
+++ tests/unit-tests/graphics/android/test_platform.cpp	2014-11-27 07:32:44 +0000
@@ -29,6 +29,8 @@
 #include "mir_test_doubles/fd_matcher.h"
 #include "mir_test/fake_shared.h"
 #include "mir_test_doubles/mock_android_native_buffer.h"
+#include "mir_test_framework/executable_path.h"
+#include "mir/shared_library.h"
 #include <system/window.h>
 #include <gtest/gtest.h>
 
@@ -39,6 +41,7 @@
 namespace mr=mir::report;
 namespace geom=mir::geometry;
 namespace mo=mir::options;
+namespace mtf=mir_test_framework;
 
 class PlatformBufferIPCPackaging : public ::testing::Test
 {
@@ -228,6 +231,27 @@
     EXPECT_EQ(EGL_DEFAULT_DISPLAY, platform.egl_native_display());
 }
 
+TEST(AndroidGraphicsPlatform, probe_returns_unsupported_when_no_hwaccess)
+{
+    using namespace testing;
+    NiceMock<mtd::HardwareAccessMock> hwaccess;
+
+    ON_CALL(hwaccess, hw_get_module(_,_)).WillByDefault(Return(-1));
+
+    mir::SharedLibrary platform_lib{mtf::library_path() + "/server-modules/graphics-android.so"};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>("probe_platform");
+    EXPECT_EQ(mg::PlatformPriority::unsupported, probe());
+}
+
+TEST(AndroidGraphicsPlatform, probe_returns_best_when_hwaccess_succeeds)
+{
+    testing::NiceMock<mtd::HardwareAccessMock> hwaccess;
+
+    mir::SharedLibrary platform_lib{mtf::library_path() + "/server-modules/graphics-android.so"};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>("probe_platform");
+    EXPECT_EQ(mg::PlatformPriority::best, probe());
+}
+
 TEST(NestedPlatformCreation, doesnt_access_display_hardware)
 {
     using namespace testing;

=== modified file 'tests/unit-tests/graphics/mesa/test_platform.cpp'
--- tests/unit-tests/graphics/mesa/test_platform.cpp	2014-11-24 02:16:00 +0000
+++ tests/unit-tests/graphics/mesa/test_platform.cpp	2014-11-27 07:32:44 +0000
@@ -22,6 +22,7 @@
 #include "src/platform/graphics/mesa/platform.h"
 #include "src/server/report/null_report_factory.h"
 #include "mir/emergency_cleanup_registry.h"
+#include "mir/shared_library.h"
 
 #include "mir_test_doubles/mock_buffer.h"
 #include "mir_test_doubles/mock_buffer_ipc_message.h"
@@ -32,6 +33,7 @@
 #include <gtest/gtest.h>
 
 #include "mir_test_framework/udev_environment.h"
+#include "mir_test_framework/executable_path.h"
 #include "mir_test/pipe.h"
 
 #include "mir_test_doubles/mock_drm.h"
@@ -332,3 +334,23 @@
 
     Mock::VerifyAndClearExpectations(&mock_drm);
 }
+
+TEST_F(MesaGraphicsPlatform, probe_returns_unsupported_when_no_drm_udev_devices)
+{
+    mtf::UdevEnvironment udev_environment;
+
+    mir::SharedLibrary platform_lib{mtf::library_path() + "/server-modules/graphics-mesa.so"};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>("probe_platform");
+    EXPECT_EQ(mg::PlatformPriority::unsupported, probe());
+}
+
+TEST_F(MesaGraphicsPlatform, probe_returns_best_when_drm_devices_exist)
+{
+    mtf::UdevEnvironment udev_environment;
+
+    udev_environment.add_standard_device("standard-drm-devices");
+
+    mir::SharedLibrary platform_lib{mtf::library_path() + "/server-modules/graphics-mesa.so"};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>("probe_platform");
+    EXPECT_EQ(mg::PlatformPriority::best, probe());
+}

=== added file 'tests/unit-tests/graphics/test_platform_prober.cpp'
--- tests/unit-tests/graphics/test_platform_prober.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/graphics/test_platform_prober.cpp	2014-11-27 07:32:44 +0000
@@ -0,0 +1,214 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include <gtest/gtest.h>
+
+#include "src/platform/graphics/platform_probe.h"
+#include "mir/graphics/platform.h"
+
+#include "mir/raii.h"
+
+#ifdef MIR_BUILD_PLATFORM_MESA
+#include "mir_test_doubles/mock_drm.h"
+#include "mir_test_doubles/mock_gbm.h"
+#endif
+
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+#include "mir_test_doubles/mock_android_hw.h"
+#endif
+
+#include "mir_test_framework/udev_environment.h"
+#include "mir_test_framework/executable_path.h"
+
+namespace mtf = mir_test_framework;
+namespace mtd = mir::test::doubles;
+
+namespace
+{
+std::vector<std::shared_ptr<mir::SharedLibrary>> available_platforms()
+{
+    std::vector<std::shared_ptr<mir::SharedLibrary>> modules;
+
+#ifdef MIR_BUILD_PLATFORM_MESA
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/server-modules/graphics-mesa.so"));
+#endif
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/server-modules/graphics-android.so"));
+#endif
+    return modules;
+}
+
+void add_dummy_platform(std::vector<std::shared_ptr<mir::SharedLibrary>>& modules)
+{
+    modules.insert(modules.begin(), std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/server-modules/graphics-dummy.so"));
+}
+
+std::shared_ptr<void> ensure_android_probing_fails()
+{
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+    using namespace testing;
+    auto mock_android = std::make_shared<NiceMock<mtd::HardwareAccessMock>>();
+    ON_CALL(*mock_android, hw_get_module(_, _))
+       .WillByDefault(Return(-1));
+    return mock_android;
+#else
+    return std::shared_ptr<void>{};
+#endif
+}
+
+std::shared_ptr<void> ensure_mesa_probing_fails()
+{
+    return std::make_shared<mtf::UdevEnvironment>();
+}
+
+std::shared_ptr<void> ensure_mesa_probing_succeeds()
+{
+    auto udev = std::make_shared<mtf::UdevEnvironment>();
+
+    udev->add_standard_device("standard-drm-devices");
+
+    return udev;
+}
+
+std::shared_ptr<void> ensure_android_probing_succeeds()
+{
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+    using namespace testing;
+    auto mock_android = std::make_shared<NiceMock<mtd::HardwareAccessMock>>();
+    ON_CALL(*mock_android, hw_get_module(_, _))
+       .WillByDefault(Return(0));
+    return mock_android;
+#else
+    return std::shared_ptr<void>{};
+#endif
+}
+}
+
+TEST(ServerPlatformProbe, ConstructingWithNoModulesIsAnError)
+{
+    std::vector<std::shared_ptr<mir::SharedLibrary>> empty_modules;
+    EXPECT_THROW(mir::graphics::module_for_device(empty_modules),
+                 std::runtime_error);
+}
+
+#ifdef MIR_BUILD_PLATFORM_MESA
+TEST(ServerPlatformProbe, LoadsMesaPlatformWhenDrmDevicePresent)
+{
+    using namespace testing;
+    auto block_android = ensure_android_probing_fails();
+    auto fake_mesa = ensure_mesa_probing_succeeds();
+
+    auto modules = available_platforms();
+
+    auto module = mir::graphics::module_for_device(modules);
+    ASSERT_NE(nullptr, module);
+
+    auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module");
+    auto description = descriptor();
+
+    EXPECT_THAT(description->name, HasSubstr("mesa"));
+}
+#endif
+
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+TEST(ServerPlatformProbe, LoadsAndroidPlatformWhenHwaccessSucceeds)
+{
+    using namespace testing;
+
+    auto block_mesa = ensure_mesa_probing_fails();
+    auto fake_android = ensure_android_probing_succeeds();
+
+    auto modules = available_platforms();
+
+    auto module = mir::graphics::module_for_device(modules);
+    ASSERT_NE(nullptr, module);
+
+    auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module");
+    auto description = descriptor();
+
+    EXPECT_THAT(description->name, HasSubstr("android"));
+}
+#endif
+
+TEST(ServerPlatformProbe, ThrowsExceptionWhenNothingProbesSuccessfully)
+{
+    using namespace testing;
+    auto block_android = ensure_android_probing_fails();
+    auto block_mesa = ensure_mesa_probing_fails();
+
+
+    EXPECT_THROW(mir::graphics::module_for_device(available_platforms()),
+                 std::runtime_error);
+}
+
+TEST(ServerPlatformProbe, LoadsSupportedModuleWhenNoBestModule)
+{
+    using namespace testing;
+    auto block_android = ensure_android_probing_fails();
+    auto block_mesa = ensure_mesa_probing_fails();
+
+    auto modules = available_platforms();
+    add_dummy_platform(modules);
+
+    auto module = mir::graphics::module_for_device(modules);
+    ASSERT_NE(nullptr, module);
+
+    auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module");
+    auto description = descriptor();
+
+    EXPECT_THAT(description->name, HasSubstr("dummy"));
+}
+
+TEST(ServerPlatformProbe, LoadsMesaOrAndroidInPreferenceToDummy)
+{
+    using namespace testing;
+
+    auto ensure_mesa = ensure_mesa_probing_succeeds();
+    auto ensure_android = ensure_android_probing_succeeds();
+
+    auto modules = available_platforms();
+    add_dummy_platform(modules);
+
+    auto module = mir::graphics::module_for_device(modules);
+    ASSERT_NE(nullptr, module);
+
+    auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module");
+    auto description = descriptor();
+
+    EXPECT_THAT(description->name, Not(HasSubstr("dummy")));
+}
+
+TEST(ServerPlatformProbe, IgnoresNonPlatformModules)
+{
+    using namespace testing;
+
+    auto ensure_mesa = ensure_mesa_probing_succeeds();
+    auto ensure_android = ensure_android_probing_succeeds();
+
+    auto modules = available_platforms();
+    add_dummy_platform(modules);
+
+    // NOTE: We want to load something that doesn't link with libmirplatform,
+    // due to protobuf throwing a screaming hissy fit if it gets loaded twice.
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() +
+                                                           "/client-modules/dummy.so"));
+
+
+    auto module = mir::graphics::module_for_device(modules);
+    EXPECT_NE(nullptr, module);
+}

=== modified file 'tests/unit-tests/shared_library_test.cpp'
--- tests/unit-tests/shared_library_test.cpp	2014-11-24 02:16:00 +0000
+++ tests/unit-tests/shared_library_test.cpp	2014-11-27 07:32:44 +0000
@@ -59,10 +59,10 @@
 public:
     SharedLibrary()
         : nonexistent_library{"imma_totally_not_a_library"},
-          existing_library{mtf::library_path() + "/" MIR_CLIENT_DRIVER_BINARY},
+          existing_library{mtf::library_path() + "/client-modules/mesa.so"},
           nonexistent_function{"yo_dawg"},
-          existing_function{"create_client_platform_factory"},
-          existent_version{"MIR_CLIENTPLATFORM_1"},
+          existing_function{"create_client_platform"},
+          existent_version{"MIR_CLIENT_PLATFORM_2"},
           nonexistent_version{"GOATS_ON_THE_GREEN"}
     {
     }

=== modified file 'tests/unit-tests/test_shared_library_prober.cpp'
--- tests/unit-tests/test_shared_library_prober.cpp	2014-11-24 02:16:00 +0000
+++ tests/unit-tests/test_shared_library_prober.cpp	2014-11-27 07:32:44 +0000
@@ -26,6 +26,7 @@
 #include <cstring>
 
 #include <system_error>
+
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 

=== modified file 'tools/install_on_android.sh'
--- tools/install_on_android.sh	2014-11-24 02:16:00 +0000
+++ tools/install_on_android.sh	2014-11-27 07:32:44 +0000
@@ -32,11 +32,12 @@
              lib/libmirclient.so.* \
              lib/libmircommon.so.* \
              lib/libmirplatform.so.* \
-             lib/libmirplatform*driver.so \
-             lib/libmirclient*driver.so \
+             lib/platform-graphics-dummy.so \
+	     lib/client-platform-dummy.so \
+	     lib/client-modules/* \
+	     lib/server-modules/* \
              lib/libmirprotobuf.so.* \
              lib/libmirclient-debug-extension.so.* \
-             lib/libmirplatformstub.so \
              lib/libmirserver.so.*
     do
         adb push $x ${RUN_DIR}

=== modified file 'tools/valgrind_suppressions_armhf'
--- tools/valgrind_suppressions_armhf	2014-11-24 02:16:00 +0000
+++ tools/valgrind_suppressions_armhf	2014-11-27 07:32:44 +0000
@@ -127,6 +127,15 @@
 # memory errors.
 
 {
+   spurious_strlen_addr4
+   Memcheck:Addr4
+   ...
+   fun:dlsym
+   ...
+   fun:_ZN50SharedLibrary_load_nonexistent_function_fails_Test8TestBodyEv
+}
+
+{
     mir_sharedlibrary_cond
     Memcheck:Cond
     fun:_ZN3mir13SharedLibraryC1EPKc