~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/android/test_output_builder.cpp

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
17
17
 */
18
18
 
19
 
#include "src/platforms/android/hal_component_factory.h"
20
 
#include "src/platforms/android/android_format_conversion-inl.h"
21
 
#include "src/platforms/android/resource_factory.h"
22
 
#include "src/platforms/android/graphic_buffer_allocator.h"
23
 
#include "src/platforms/android/hwc_loggers.h"
 
19
#include "src/platforms/android/server/hal_component_factory.h"
 
20
#include "src/platforms/android/server/android_format_conversion-inl.h"
 
21
#include "src/platforms/android/server/resource_factory.h"
 
22
#include "src/platforms/android/server/graphic_buffer_allocator.h"
 
23
#include "src/platforms/android/server/hwc_loggers.h"
24
24
#include "mir_test_doubles/mock_buffer.h"
25
25
#include "mir_test_doubles/mock_display_report.h"
26
26
#include "mir_test/fake_shared.h"