Mir

Merge lp:~albaguirre/mir/automate-abi-check into lp:mir

automate-abi-check
Merge into development-branch

Proposed by Alberto Aguirre on 2015-04-01

Status:	Merged
Approved by:	Alberto Aguirre on 2015-04-06
Approved revision:	no longer in the source branch.
Merged at revision:	2456
Proposed branch:	lp:~albaguirre/mir/automate-abi-check
Merge into:	lp:mir
Diff against target:	459 lines (+183/-50) 16 files modified cmake/ABICheck.cmake (+37/-11) debian/control (+1/-0) include/platform/mir/graphics/platform.h (+17/-14) src/include/client/mir/client_platform_factory.h (+4/-5) src/platforms/android/client/client_platform_factory.cpp (+2/-2) src/platforms/android/server/platform.cpp (+2/-2) src/platforms/common/server/symbols.map (+0/-9) src/platforms/mesa/client/client_platform_factory.cpp (+2/-2) src/platforms/mesa/server/platform.cpp (+2/-2) tests/integration-tests/graphics/mesa/test_buffer_integration.cpp (+1/-1) tests/mir_test_doubles/platform_factory.cpp (+1/-1) tests/unit-tests/graphics/android/test_platform.cpp (+1/-1) tools/abi-check-mirclient-skip-symbols (+1/-0) tools/generate-abi-base-dump.sh (+13/-0) tools/run_abi_compliance_checker.sh (+98/-0) tools/setup-partial-armhf-chroot.sh (+1/-0)
To merge this branch:	bzr merge lp:~albaguirre/mir/automate-abi-check
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2015-04-07
Kevin DuBois (community)			Approve on 2015-04-03
Alexandros Frantzis (community)			Approve on 2015-04-03
Alan Griffiths		2015-04-01	Needs Information on 2015-04-01
Review via email: mp+254947@code.launchpad.net

Commit message

Automate abi-check

Description of the change

Automate abi-check

make abi-check now works without any additional user setup.

Setting the env variable MIR_ENABLE_ABI_CHECK_TEST will add the abi-compliance-check cmake test which runs "make abi-check" during ctest (or make test). This can then probably be used to selectively turn on the ABI check on a CI job.

I added support to dump ABI for the client and graphic platform libraries but it currently won't check ABI since the previous release did not track these libraries.

I ran into a small issue due to mixing extern "C" with namespaces which confuses abi-compliance-checker.

Since an extern "C" declaration will drop the namespace (e.g. there's no mir::client::create_client_platform symbol but just create_client_platform) I aligned the header declarations with the resulting symbol name which makes abi-compliance-checker happy.

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-04-01:

1. This adds a build dependency on abi-compliance-checker - shouldn't we put that in debian/control?

2. Why "Setting the env variable MIR_RUN_ABI_CHECK_DURING_BUILD"? I'd expected a target. E.g. "make abi-compliance-check".

review: Needs Information

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2015-04-01:

1. Fixed.

2. It is indeed a make target - "make abi-check"

The environment variable is there to make it run as part of the default target (i.e. during a normal build).

Since CI jobs just run debian package builds, I thought it would be easier to configure a Jenkins Job to just populate an environment variable to "turn on" abi checking (for example in the CI job for mir/ubuntu)

I don't know how involved it is to configure a Jenkins job to somehow run "make abi-check".

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-01:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2015-04-01:

> I don't know how involved it is to configure a Jenkins job to somehow run
> "make abi-check".

Perhaps "make abi-check" could be part of "make test" (so dh_auto_test would run it), or maybe we can make use of override_dh_auto_test in debian/rules.

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2015-04-01:

> > I don't know how involved it is to configure a Jenkins job to somehow run
> > "make abi-check".
>
> Perhaps "make abi-check" could be part of "make test"

Good idea, will use add_test instead.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-01:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-01:

FAILED: Continuous integration, rev:2443
http://jenkins.qa.ubuntu.com/job/mir-ci/3431/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1922/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1921/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1872/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1428
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1428/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1872/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-02:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2015-04-02:

343 +make -j${NUM_JOBS} abi-dump-base

This will rebuild the archive version of mir. It's not too bad since we will not be building the tests, but it still is an overhead we can avoid.

The alternative is to reuse the prebuilt archive packages. A way to do this is:

1. apt-get --print-uris --yes install libmirserver-dev libmirclient-dev ... | grep ^\' | cut -d\' -f > mir-archive.list
2. download each debian package in mir-archive.list (wget -i mir-archive.list)
3. Extract debian packages to some location (dpkg -x ... some/location)
4. MIR_ABI_DUMP_PREBUILT_LIBDIR=/some/location/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) debian/rules override_dh_auto_configure
5. make abi-dump-base

Needs discussion

review: Needs Information

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2015-04-02:

> 343 +make -j${NUM_JOBS} abi-dump-base
>
> This will rebuild the archive version of mir. It's not too bad since we will
> not be building the tests, but it still is an overhead we can avoid.
>
> The alternative is to reuse the prebuilt archive packages. A way to do this
> is:
>
> 1. apt-get --print-uris --yes install libmirserver-dev libmirclient-dev ... |
> grep ^\' | cut -d\' -f > mir-archive.list
> 2. download each debian package in mir-archive.list (wget -i mir-archive.list)
> 3. Extract debian packages to some location (dpkg -x ... some/location)
> 4. MIR_ABI_DUMP_PREBUILT_LIBDIR=/some/location/usr/lib/$(dpkg-architecture
> -qDEB_HOST_MULTIARCH) debian/rules override_dh_auto_configure
> 5. make abi-dump-base
>
> Needs discussion

Yes I experimented with this a bit.

One issue is that you have to deal with the package cache - no uris will be printed if the package is already in your cache.

This shouldn't matter for a clean environment like in a CI job, but in a developer machine it could be an issue.

So a bit more intelligence is needed (figuring out the package names, some caching, looking into the existing package cache) - hence I went with the path of least resistance - apt-get source mir already downloads, caches and extracts, there's no package versions to figure out, etc.

I think it's doable but I guess I would consider that an additional optimization task that could be a separate MP.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-02:

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

review: Approve (continuous-integration)

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2015-04-03:

> I think it's doable but I guess I would consider that an additional optimization task that could be a separate MP.

OK. I think it's a task worth doing considering the processing time needed for rebuilding the archive sources with every CI (or is the plan to use it for autolanding only?).

review: Approve

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2015-04-03:

> > I think it's doable but I guess I would consider that an additional
> optimization task that could be a separate MP.
>
> OK. I think it's a task worth doing considering the processing time needed for
> rebuilding the archive sources with every CI (or is the plan to use it for
> autolanding only?).

I'd be in favor of autolanding only at first. So we incur minimal overhead in terms of build-time while catching before landing. We should follow up with a card for the optimization however, as some of the automation we talked about requires checker to be run for MPs as well (for instance, we want to know if ABI is broken so downstreams can be updated as well before Mir-side lands).

Revision history for this message

Kevin DuBois (kdub) wrote on 2015-04-03:

lgtm, adding the card as a further improvement also sounds good.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-06:

review: Needs Fixing (continuous-integration)

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2015-04-06:

^-Looks unrelated.

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2015-04-07:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alberto Aguirre

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'cmake/ABICheck.cmake'
 --- cmake/ABICheck.cmake	2015-01-21 07:34:50 +0000
 +++ cmake/ABICheck.cmake	2015-04-02 15:51:41 +0000
@@ -1,12 +1,20 @@
  cmake_minimum_required (VERSION 2.6)
++find_program(ABI_COMPLIANCE_CHECKER abi-compliance-checker)
++
++if (NOT ABI_COMPLIANCE_CHECKER)
++  message(WARNING "no ABI checks possible: abi-compliance-checker was not found")
++  return()
++endif()
++
  execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpmachine OUTPUT_VARIABLE ABI_CHECK_TARGET_MACH OUTPUT_STRIP_TRAILING_WHITESPACE)
  set(ABI_CHECK_BASE_DIR $ENV{MIR_ABI_CHECK_BASE_DIR})
  set(ABI_DUMP_PREBUILT_LIBDIR $ENV{MIR_ABI_DUMP_PREBUILT_LIBDIR})
++set(ENABLE_ABI_CHECK_TEST $ENV{MIR_ENABLE_ABI_CHECK_TEST})
  if ("${ABI_CHECK_BASE_DIR}" STREQUAL "")
--  set(ABI_CHECK_BASE_DIR ${CMAKE_BINARY_DIR}/abi_dumps)
++  set(ABI_CHECK_BASE_DIR ${CMAKE_BINARY_DIR}/mir-prev-release/obj-${ABI_CHECK_TARGET_MACH}/abi_dumps)
  endif()
  set(ABI_DUMPS_DIR_PREFIX "abi_dumps/${ABI_CHECK_TARGET_MACH}")
@@ -35,9 +43,12 @@
      set(private_headers "${CMAKE_SOURCE_DIR}/src/include/${name}")
    endif()
--  set(LIB_DESC_HEADERS "${CMAKE_SOURCE_DIR}/include/${name}
--    ${private_headers}"
--  )
++  get_value_for_arg("${ARGN}" "LIBRARY_HEADER" library_header)
++  if ("${library_header}" STREQUAL "")
++    set(LIB_DESC_HEADERS "${CMAKE_SOURCE_DIR}/include/${name}\n    ${private_headers}")
++  else()
++    set(LIB_DESC_HEADERS ${library_header})
++  endif()
    if (NOT ${CMAKE_MAJOR_VERSION} LESS 3)
      cmake_policy(SET CMP0026 OLD)
@@ -59,13 +70,24 @@
    configure_file(${CMAKE_SOURCE_DIR}/tools/lib_descriptor.xml.skel ${libname}_desc.xml)
  endfunction()
--#These headers are not part of the libmircommon interface
--set(android-platform-headers "${CMAKE_SOURCE_DIR}/src/include/common/mir/graphics/android")
++#These headers are not part of the libmircommon ABI
++set(mircommon-exclude-headers "${CMAKE_SOURCE_DIR}/src/include/common/mir/graphics/android\n    ${CMAKE_SOURCE_DIR}/src/include/common/mir/input")
++
++#These headers are not part of the libmirplatform ABI
++set(mirplatform-exclude-headers "${CMAKE_SOURCE_DIR}/include/platform/mir/input")
  make_lib_descriptor(client)
  make_lib_descriptor(server)
--make_lib_descriptor(common INCLUDE_PRIVATE EXCLUDE_HEADERS ${android-platform-headers})
--make_lib_descriptor(platform INCLUDE_PRIVATE)
++make_lib_descriptor(common INCLUDE_PRIVATE EXCLUDE_HEADERS ${mircommon-exclude-headers})
++make_lib_descriptor(platform INCLUDE_PRIVATE EXCLUDE_HEADERS ${mirplatform-exclude-headers})
++make_lib_descriptor(clientplatformmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
++make_lib_descriptor(clientplatformandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
++make_lib_descriptor(platformgraphicsmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
++make_lib_descriptor(platformgraphicsandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
++
++add_custom_target(abi-release-dump
++  COMMAND /bin/sh -c '${CMAKE_SOURCE_DIR}/tools/generate-abi-base-dump.sh ${CMAKE_SOURCE_DIR}'
++)
  macro(_add_custom_abi_dump_command libname version)
    set(ABI_DUMP_NAME ${ABI_DUMPS_DIR_PREFIX}/${libname}_${version}.abi.tar.gz)
@@ -93,12 +115,12 @@
    set(OLD_ABI_DUMP "${ABI_CHECK_BASE_DIR}/${ABI_CHECK_TARGET_MACH}/${libname}_base.abi.tar.gz")
    set(NEW_ABI_DUMP ${ABI_DUMPS_DIR_PREFIX}/${libname}_next.abi.tar.gz)
    add_custom_target(abi-check-${libname}
--    COMMAND abi-compliance-checker -l ${libname} -old "${OLD_ABI_DUMP}" -new "${NEW_ABI_DUMP}" -check-implementation
--    DEPENDS abi-dump-${libname}
++    COMMAND /bin/bash -c '${CMAKE_SOURCE_DIR}/tools/run_abi_compliance_checker.sh ${libname} ${CMAKE_BINARY_DIR}/mir-prev-release ${CMAKE_SOURCE_DIR} ${OLD_ABI_DUMP} ${NEW_ABI_DUMP}'
++    DEPENDS abi-dump-${libname} abi-release-dump
+   )
  endmacro(_define_abi_check_for)
--set(the_libs mirserver mirclient mircommon mirplatform)
++set(the_libs mirserver mirclient mircommon mirplatform mirclientplatformmesa mirclientplatformandroid mirplatformgraphicsmesa mirplatformgraphicsandroid)
  foreach(libname ${the_libs})
    _define_abi_dump_for(${libname})
@@ -111,3 +133,7 @@
  add_custom_target(abi-dump DEPENDS ${abi-dump-list})
  add_custom_target(abi-dump-base DEPENDS ${abi-dump-base-list})
  add_custom_target(abi-check DEPENDS ${abi-check-list})
++
++if (MIR_ENABLE_TESTS AND ENABLE_ABI_CHECK_TEST)
++  add_test(abi-compliance-check make abi-check)
++endif()
 === modified file 'debian/control'
 --- debian/control	2015-03-31 02:35:42 +0000
 +++ debian/control	2015-04-02 15:51:41 +0000
@@ -41,6 +41,7 @@
                 valgrind [!arm64],
                 libglib2.0-dev,
                 libfreetype6-dev,
++               abi-compliance-checker,
  Standards-Version: 3.9.4
  Homepage: https://launchpad.net/mir
  # If you aren't a member of ~mir-team but need to upload packaging changes,
 === modified file 'include/platform/mir/graphics/platform.h'
 --- include/platform/mir/graphics/platform.h	2015-03-31 02:35:42 +0000
 +++ include/platform/mir/graphics/platform.h	2015-04-02 15:51:41 +0000
@@ -129,10 +129,6 @@
      std::shared_ptr<options::Option> const& options,
      std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup_registry,
      std::shared_ptr<DisplayReport> const& report);
--extern "C" std::shared_ptr<Platform> create_host_platform(
--    std::shared_ptr<options::Option> const& options,
--    std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup_registry,
--    std::shared_ptr<DisplayReport> const& report);
  /**
   * Function prototype used to return a new guest graphics platform. The guest graphics platform
@@ -148,9 +144,6 @@
  extern "C" typedef std::shared_ptr<Platform>(*CreateGuestPlatform)(
      std::shared_ptr<DisplayReport> const& report,
      std::shared_ptr<NestedContext> const& nested_context);
--extern "C" std::shared_ptr<Platform> create_guest_platform(
--    std::shared_ptr<DisplayReport> const& report,
--    std::shared_ptr<NestedContext> const& nested_context);
  /**
   * Function prototype used to add platform specific options to the platform-independant server options.
@@ -163,18 +156,28 @@
   */
  extern "C" typedef void(*AddPlatformOptions)(
      boost::program_options::options_description& config);
--extern "C" void add_graphics_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_graphcis_platform();
--
  extern "C" typedef ModuleProperties const*(*DescribeModule)();
--extern "C" ModuleProperties const* describe_graphics_module();
--}
--}
++}
++}
++
++extern "C" std::shared_ptr<mir::graphics::Platform> create_host_platform(
++    std::shared_ptr<mir::options::Option> const& options,
++    std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
++    std::shared_ptr<mir::graphics::DisplayReport> const& report);
++
++extern "C" std::shared_ptr<mir::graphics::Platform> create_guest_platform(
++    std::shared_ptr<mir::graphics::DisplayReport> const& report,
++    std::shared_ptr<mir::graphics::NestedContext> const& nested_context);
++
++extern "C" void add_graphics_platform_options(
++    boost::program_options::options_description& config);
++
++extern "C" mir::graphics::PlatformPriority probe_graphcis_platform();
++extern "C" mir::ModuleProperties const* describe_graphics_module();
  #endif // MIR_GRAPHICS_PLATFORM_H_
 === modified file 'src/include/client/mir/client_platform_factory.h'
 --- src/include/client/mir/client_platform_factory.h	2015-01-21 07:34:50 +0000
 +++ src/include/client/mir/client_platform_factory.h	2015-04-02 15:51:41 +0000
@@ -42,12 +42,11 @@
  };
  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);
++}
++}
--}
--}
++extern "C" std::shared_ptr<mir::client::ClientPlatform> create_client_platform(mir::client::ClientContext* context);
++extern "C" bool is_appropriate_module(mir::client::ClientContext* context);
  #endif /* MIR_CLIENT_CLIENT_PLATFORM_FACTORY_H_ */
 === renamed file 'src/include/common/mir/event_type_to_string.h' => 'src/include/client/mir/event_type_to_string.h'
 === modified file 'src/platforms/android/client/client_platform_factory.cpp'
 --- src/platforms/android/client/client_platform_factory.cpp	2015-02-02 12:18:18 +0000
 +++ src/platforms/android/client/client_platform_factory.cpp	2015-04-02 15:51:41 +0000
@@ -28,7 +28,7 @@
  namespace mcla = mcl::android;
  extern "C" std::shared_ptr<mcl::ClientPlatform>
--mcl::create_client_platform(mcl::ClientContext* context)
++create_client_platform(mcl::ClientContext* context)
+ {
      MirPlatformPackage platform;
      context->populate_server_package(platform);
@@ -40,7 +40,7 @@
+ }
  extern "C" bool
--mcl::is_appropriate_module(mcl::ClientContext* context)
++is_appropriate_module(mcl::ClientContext* context)
+ {
      MirPlatformPackage platform;
      context->populate_server_package(platform);
 === modified file 'src/platforms/android/server/platform.cpp'
 --- src/platforms/android/server/platform.cpp	2015-03-31 02:35:42 +0000
 +++ src/platforms/android/server/platform.cpp	2015-04-02 15:51:41 +0000
@@ -131,10 +131,10 @@
      return EGL_DEFAULT_DISPLAY;
+ }
--extern "C" std::shared_ptr<mg::Platform> mg::create_host_platform(
++extern "C" std::shared_ptr<mg::Platform> create_host_platform(
      std::shared_ptr<mo::Option> const& options,
      std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
--    std::shared_ptr<DisplayReport> const& display_report)
++    std::shared_ptr<mir::graphics::DisplayReport> const& display_report)
+ {
      auto hwc_report = make_hwc_report(*options);
      auto overlay_option = should_use_overlay_optimization(*options);
 === removed directory 'src/platforms/common/server'
 === removed file 'src/platforms/common/server/symbols.map'
 --- src/platforms/common/server/symbols.map	2015-03-31 02:35:42 +0000
 +++ src/platforms/common/server/symbols.map	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
--MIR_GRAPHICS_PLATFORM_2 {
--  global:
--   add_graphics_platform_options;
--   probe_graphics_platform;
--   create_host_platform;
--   create_guest_platform;
--   describe_graphics_module;
--  local: *;
--};
 === modified file 'src/platforms/mesa/client/client_platform_factory.cpp'
 --- src/platforms/mesa/client/client_platform_factory.cpp	2015-02-02 12:18:18 +0000
 +++ src/platforms/mesa/client/client_platform_factory.cpp	2015-04-02 15:51:41 +0000
@@ -61,7 +61,7 @@
+ }
--extern "C" std::shared_ptr<mcl::ClientPlatform> mcl::create_client_platform(mcl::ClientContext* context)
++extern "C" std::shared_ptr<mcl::ClientPlatform> create_client_platform(mcl::ClientContext* context)
+ {
      MirPlatformPackage package;
      context->populate_server_package(package);
@@ -75,7 +75,7 @@
+ }
  extern "C" bool
--mcl::is_appropriate_module(mcl::ClientContext* context)
++is_appropriate_module(mcl::ClientContext* context)
+ {
      MirPlatformPackage platform;
      context->populate_server_package(platform);
 === modified file 'src/platforms/mesa/server/platform.cpp'
 --- src/platforms/mesa/server/platform.cpp	2015-03-31 02:35:42 +0000
 +++ src/platforms/mesa/server/platform.cpp	2015-04-02 15:51:41 +0000
@@ -165,10 +165,10 @@
      return bypass_option_;
+ }
--extern "C" std::shared_ptr<mg::Platform> mg::create_host_platform(
++extern "C" std::shared_ptr<mg::Platform> create_host_platform(
      std::shared_ptr<mo::Option> const& options,
      std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
--    std::shared_ptr<DisplayReport> const& report)
++    std::shared_ptr<mir::graphics::DisplayReport> const& report)
+ {
      auto real_fops = std::make_shared<RealVTFileOperations>();
      auto real_pops = std::unique_ptr<RealPosixProcessOperations>(new RealPosixProcessOperations{});
 === modified file 'tests/integration-tests/graphics/mesa/test_buffer_integration.cpp'
 --- tests/integration-tests/graphics/mesa/test_buffer_integration.cpp	2015-01-21 07:34:50 +0000
 +++ tests/integration-tests/graphics/mesa/test_buffer_integration.cpp	2015-04-02 15:51:41 +0000
@@ -99,7 +99,7 @@
          if (options->get<bool>("tests-use-real-graphics"))
+         {
--            platform = mg::create_host_platform(
++            platform = create_host_platform(
                  options,
                  std::make_shared<mtd::NullEmergencyCleanup>(),
                  mr::null_display_report());
 === modified file 'tests/mir_test_doubles/platform_factory.cpp'
 --- tests/mir_test_doubles/platform_factory.cpp	2015-01-22 09:00:14 +0000
 +++ tests/mir_test_doubles/platform_factory.cpp	2015-04-02 15:51:41 +0000
@@ -35,7 +35,7 @@
  auto mtd::create_platform_with_null_dependencies()
      -> std::shared_ptr<graphics::Platform>
+ {
--    return graphics::create_host_platform(
++    return create_host_platform(
          std::make_shared<options::ProgramOption>(),
          std::make_shared<NullEmergencyCleanup>(),
          report::null_display_report());
 === modified file 'tests/unit-tests/graphics/android/test_platform.cpp'
 --- tests/unit-tests/graphics/android/test_platform.cpp	2015-03-31 02:35:42 +0000
 +++ tests/unit-tests/graphics/android/test_platform.cpp	2015-04-02 15:51:41 +0000
@@ -265,5 +265,5 @@
      EXPECT_CALL(hwaccess, hw_get_module(StrEq(GRALLOC_HARDWARE_MODULE_ID), _))
          .Times(AtMost(1));
--    auto platform = mg::create_guest_platform(mt::fake_shared(stub_report), nullptr);
++    auto platform = create_guest_platform(mt::fake_shared(stub_report), nullptr);
+ }
 === added file 'tools/abi-check-mirclient-skip-symbols'
 --- tools/abi-check-mirclient-skip-symbols	1970-01-01 00:00:00 +0000
 +++ tools/abi-check-mirclient-skip-symbols	2015-04-02 15:51:41 +0000
@@ -0,0 +1,1 @@
++mir_surface_set_event_handler
 \ No newline at end of file
 === removed directory 'tools/abi_dumps'
 === added file 'tools/generate-abi-base-dump.sh'
 --- tools/generate-abi-base-dump.sh	1970-01-01 00:00:00 +0000
 +++ tools/generate-abi-base-dump.sh	2015-04-02 15:51:41 +0000
@@ -0,0 +1,13 @@
++#!/bin/sh
++
++NUM_JOBS=$(( $(grep -c ^processor /proc/cpuinfo) + 1 ))
++
++apt-get source mir
++MIR_RELEASE_DIR=$(find -maxdepth 1 -name mir-\* -type d)
++ln -sf ${MIR_RELEASE_DIR}/ mir-prev-release
++cd ${MIR_RELEASE_DIR}
++debian/rules override_dh_auto_configure
++cd obj-$(dpkg-architecture -qDEB_HOST_MULTIARCH)
++make -j${NUM_JOBS} abi-dump-base
++
++
 === added file 'tools/run_abi_compliance_checker.sh'
 --- tools/run_abi_compliance_checker.sh	1970-01-01 00:00:00 +0000
 +++ tools/run_abi_compliance_checker.sh	2015-04-02 15:51:41 +0000
@@ -0,0 +1,98 @@
++#!/bin/bash
++
++declare -A abi_var_for
++abi_var_for=( ["mirclient"]="MIRCLIENT_ABI" \
++    ["mircommon"]="MIRCOMMON_ABI" \
++    ["mirplatform"]="MIRPLATFORM_ABI" \
++    ["mirprotobuf"]="MIRPROTOBUF_ABI" \
++    ["mirserver"]="MIRSERVER_ABI" \
++    ["mirclientplatformandroid"]="MIR_CLIENT_PLATFORM_ABI" \
++    ["mirclientplatformmesa"]="MIR_CLIENT_PLATFORM_ABI" \
++    ["mirplatformgraphicsandroid"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" \
++    ["mirplatformgraphicsmesa"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" )
++
++print_help_and_exit()
++{
++    local prog=$(basename $0)
++
++    local all_libs=${!abi_var_for[@]}
++    local all_libs=${all_libs// /|}
++    echo "Usage: $prog <libname> <old_release_dir> <new_release_dir> <old_abi_dump> <new_abi_dump>"
++    echo "Runs a full ABI check if the ABI number has not been changed"
++    echo ""
++    echo "    libname=[${all_libs}]"
++    exit 0
++}
++
++get_abi_number()
++{
++    local abi_var=${1}
++    local search_dir=${2}
++    grep -hR --include=CMakeLists.txt "set($abi_var [[:digit:]]\+)" ${search_dir}/src | grep -o '[[:digit:]]\+'
++}
++
++need_abi_check()
++{
++    local libname=${1}
++    local old_release_dir=${2}
++    local next_release_dir=${3}
++    local abi_var=${abi_var_for[${libname}]}
++
++    local old_abi=$(get_abi_number ${abi_var} ${old_release_dir})
++    local new_abi=$(get_abi_number ${abi_var} ${next_release_dir})
++    if [ -z "${old_abi}" ];
++    then
++        old_abi=0
++    fi
++
++    if [ -z "${new_abi}" ];
++    then
++        echo "Failed to find new ${abi_var}" >&2
++        exit 1
++    fi
++    echo "Detected ${abi_var}_new=${new_abi}"
++    echo "Detected ${abi_var}_old=${old_abi}"
++
++    if [ "${old_abi}" == "${new_abi}" ];
++    then
++        return 0
++    else
++        return 1
++    fi
++}
++
++if [ $# -ne 5 ];
++then
++    print_help_and_exit
++fi
++
++LIB_NAME=${1}
++OLD_RELEASE_DIR=${2}
++NEXT_RELEASE_DIR=${3}
++OLD_ABI_DUMP=${4}
++NEW_ABI_DUMP=${5}
++
++SKIP_SYMBOLS_FILE=${NEXT_RELEASE_DIR}/tools/abi-check-${LIB_NAME}-skip-symbols
++if [ -f ${SKIP_SYMBOLS_FILE} ];
++then
++SKIP_SYMBOLS_OPT="-skip-symbols ${SKIP_SYMBOLS_FILE}"
++fi
++
++if need_abi_check ${LIB_NAME} ${OLD_RELEASE_DIR} ${NEXT_RELEASE_DIR};
++then
++    if [ ! -f "${OLD_ABI_DUMP}" ];
++    then
++        # This does not return an error code on purpose
++        # The previous release source may not have the required changes
++        # to generate an ABI dump of the requested library
++        # TODO: Exit with error code once the archive mir release
++        # can dump ABI for all libraries of interest
++        echo "Warning: No base abi dump exists for ${LIB_NAME}"
++        echo "skipping abi-compliance-checker for ${LIB_NAME}"
++    else
++        echo "Running abi-compliance-checker for ${LIB_NAME}"
++        abi-compliance-checker -l ${LIB_NAME} -old "${OLD_ABI_DUMP}" -new "${NEW_ABI_DUMP}" -check-implementation ${SKIP_SYMBOLS_OPT}
++    fi
++else
++    echo "No need for abi-compliance-checker, ABI has already been bumped for ${LIB_NAME}"
++fi
 === modified file 'tools/setup-partial-armhf-chroot.sh'
 --- tools/setup-partial-armhf-chroot.sh	2015-01-21 07:34:50 +0000
 +++ tools/setup-partial-armhf-chroot.sh	2015-04-02 15:51:41 +0000
@@ -39,6 +39,7 @@
  builddeps=$(echo ${builddeps} | sed -e 's/dpkg-checkbuilddeps://g' -e 's/Unmet build dependencies://g' -e 's/build-essential:native//g')
  builddeps=$(echo ${builddeps} | sed 's/([^)]*)//g')
  builddeps=$(echo ${builddeps} | sed 's/ /,/g')
++builddeps=$(echo ${builddeps} | sed -e 's/abi-compliance-checker//g')
  fakeroot debootstrap --include=${builddeps} --arch=armhf --download-only --variant=buildd vivid .