← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to tests/unit-tests/client/test_client_platform.cpp

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/client/test_client_platform.cpp
79
79
};
80
80
 
81
81
#ifdef MIR_BUILD_PLATFORM_ANDROID
82
 
ClientPlatformTraits const android_platform{"android.so",
 
82
ClientPlatformTraits const android_platform{"android",
83
83
                                            [](MirPlatformPackage& pkg)
84
84
                                            {
85
85
                                                ::memset(&pkg, 0, sizeof(pkg));
94
94
#endif
95
95
 
96
96
#ifdef MIR_BUILD_PLATFORM_MESA
97
 
ClientPlatformTraits const mesa_platform{"mesa.so",
 
97
ClientPlatformTraits const mesa_platform{"mesa",
98
98
                                         [](MirPlatformPackage& pkg)
99
99
                                         {
100
100
                                             ::memset(&pkg, 0, sizeof(pkg));