~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/android/test_buffer_tex_bind.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/buffer.h"
 
19
#include "src/platforms/android/server/buffer.h"
20
20
#include "mir/graphics/egl_extensions.h"
21
21
#include "mir_test_doubles/mock_egl.h"
22
22
#include "mir_test_doubles/mock_fence.h"