~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to src/platforms/android/utils/CMakeLists.txt

Committer: Daniel van Vugt
Date: 2016-07-18 07:38:38 UTC
mfrom: (3595 development-branch)
mto: This revision was merged to the branch mainline in revision 3748.
Revision ID: daniel.van.vugt@canonical.com-20160718073838-tclt9c441h505wck

Merge latest trunk. No conflicts in 7+ weeks?!

files added:
.bzrignore

include/common/mir/input

include/common/mir/input/keymap.h

include/server/mir/input/keyboard_configuration.h

include/server/mir/scene/application_not_responding_detector_wrapper.h

playground/mir_demo_client_chain_jumping_buffers.c

src/client/error_buffer.cpp

src/client/error_buffer.h

src/client/mir_buffer.h

src/include/common/mir/input/key_mapper.h

src/platforms/android/common/native_window_report.cpp

src/platforms/android/include/native_window_report.h

src/platforms/eglstream-kms

src/platforms/eglstream-kms/CMakeLists.txt

src/platforms/eglstream-kms/client

src/platforms/eglstream-kms/client/CMakeLists.txt

src/platforms/eglstream-kms/client/client_buffer.cpp

src/platforms/eglstream-kms/client/client_buffer.h

src/platforms/eglstream-kms/client/client_buffer_factory.cpp

src/platforms/eglstream-kms/client/client_buffer_factory.h

src/platforms/eglstream-kms/client/client_platform.cpp

src/platforms/eglstream-kms/client/client_platform.h

src/platforms/eglstream-kms/client/client_platform_factory.cpp

src/platforms/eglstream-kms/client/symbols.map

src/platforms/eglstream-kms/server

src/platforms/eglstream-kms/server/CMakeLists.txt

src/platforms/eglstream-kms/server/buffer_allocator.cpp

src/platforms/eglstream-kms/server/buffer_allocator.h

src/platforms/eglstream-kms/server/display.cpp

src/platforms/eglstream-kms/server/display.h

src/platforms/eglstream-kms/server/egl_output.cpp

src/platforms/eglstream-kms/server/egl_output.h

src/platforms/eglstream-kms/server/kms_display_configuration.cpp

src/platforms/eglstream-kms/server/kms_display_configuration.h

src/platforms/eglstream-kms/server/platform.cpp

src/platforms/eglstream-kms/server/platform.h

src/platforms/eglstream-kms/server/platform_symbols.cpp

src/platforms/eglstream-kms/server/symbols.map.in

src/server/graphics/nested/input_platform.cpp

src/server/graphics/nested/input_platform.h

src/server/scene/application_not_responding_detector_wrapper.cpp

tests/acceptance-tests/server_stop_callback.cpp

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_persistent_surface_store.cpp

tests/include/mir/test/doubles/mock_key_mapper.h

tests/include/mir/test/doubles/mock_mir_buffer.h

tests/unit-tests/client/test_error_buffer.cpp

tests/unit-tests/graphics/android/test_anw_logger.cpp

tests/unit-tests/graphics/kms-utils/test_drm_mode_resources.cpp

tests/unit-tests/input/test_nested_input_platform.cpp

tools/valgrind_suppressions_libhybris

files removed:
src/server/graphics/offscreen

src/server/graphics/offscreen/CMakeLists.txt

src/server/graphics/offscreen/display.cpp

src/server/graphics/offscreen/display.h

src/server/graphics/offscreen/display_buffer.cpp

src/server/graphics/offscreen/display_buffer.h

src/server/graphics/offscreen/display_configuration.cpp

src/server/graphics/offscreen/display_configuration.h

tests/unit-tests/graphics/offscreen

tests/unit-tests/graphics/offscreen/CMakeLists.txt

tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp

files renamed:
debian/libmircommon5.install => debian/libmircommon6.install

debian/libmirplatform12.install => debian/libmirplatform13.install

debian/libmirserver39.install => debian/libmirserver41.install

debian/mir-platform-graphics-android9.install => debian/mir-platform-graphics-android10.install

debian/mir-platform-graphics-mesa-kms9.install => debian/mir-platform-graphics-mesa-kms10.install

debian/mir-platform-graphics-mesa-x9.install => debian/mir-platform-graphics-mesa-x10.install

files modified:
3rd_party/android-deps/android/input.h

3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h

3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h

3rd_party/android-input/android/frameworks/base/services/input/Input.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp

CMakeLists.txt

cmake/MirCommon.cmake

debian/changelog

debian/control

examples/cursors_demo_client.c

examples/mir_demo_server_loader.cpp

examples/render_surfaces.cpp

examples/server_example.cpp

examples/server_example_adorning_compositor.cpp

examples/server_example_canonical_window_manager.cpp

include/client/mir/event_printer.h

include/client/mir/events/event_builders.h

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/events/input_device_state_event.h

include/client/mir_toolkit/events/surface_output_event.h

include/client/mir_toolkit/mir_surface.h

include/common/mir/geometry/dimensions.h

include/common/mir_toolkit/common.h

include/platform/mir/graphics/platform.h

include/platform/mir/input/event_builder.h

include/platform/mir/input/input_sink.h

include/server/mir/frontend/buffer_sink.h

include/server/mir/input/device.h

include/server/mir/scene/surface.h

include/server/mir/scene/surface_creation_parameters.h

include/server/mir/server.h

include/server/mir/shell/abstract_shell.h

include/server/mir/shell/surface_specification.h

include/test/mir/test/doubles/mock_egl.h

include/test/mir/test/doubles/null_platform.h

include/test/mir/test/doubles/stub_input_device.h

include/test/mir/test/doubles/stub_surface.h

include/test/mir/test/event_matchers.h

playground/CMakeLists.txt

playground/demo-shell/demo_compositor.cpp

playground/mir_demo_client_prerendered_frames.c

src/CMakeLists.txt

src/client/CMakeLists.txt

src/client/atomic_callback.h

src/client/buffer.cpp

src/client/buffer.h

src/client/buffer_factory.cpp

src/client/buffer_factory.h

src/client/buffer_stream.cpp

src/client/buffer_vault.cpp

src/client/buffer_vault.h

src/client/connection_surface_map.h

src/client/error_connections.cpp

src/client/event.cpp

src/client/event_printer.cpp

src/client/events/event_builders.cpp

src/client/input/android/android_input_lexicon.cpp

src/client/input/android/android_input_receiver.cpp

src/client/input/xkb_mapper.cpp

src/client/logging/rpc_report.cpp

src/client/mir_buffer_api.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_presentation_chain.h

src/client/mir_presentation_chain_api.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/presentation_chain.cpp

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/surface_map.cpp

src/client/surface_map.h

src/client/symbols.map

src/common/CMakeLists.txt

src/common/events/event.cpp

src/common/events/input_device_state_event.cpp

src/common/symbols.map

src/include/client/mir/client_context.h

src/include/client/mir_toolkit/mir_buffer.h

src/include/common/mir/events/input_device_state_event.h

src/include/common/mir/input/xkb_mapper.h

src/include/platform/mir/options/configuration.h

src/include/server/mir/default_server_configuration.h

src/include/server/mir/input/seat.h

src/include/server/mir/server_configuration.h

src/include/server/mir/shell/canonical_window_manager.h

src/include/server/mir/shell/window_management_info.h

src/platform/options/default_configuration.cpp

src/platform/symbols.map

src/platforms/CMakeLists.txt

src/platforms/android/client/android_client_platform.cpp

src/platforms/android/client/client_platform_factory.cpp

src/platforms/android/common/CMakeLists.txt

src/platforms/android/common/mir_native_window.cpp

src/platforms/android/include/mir_native_window.h

src/platforms/android/server/device_quirks.cpp

src/platforms/android/server/device_quirks.h

src/platforms/android/server/display.cpp

src/platforms/android/server/display.h

src/platforms/android/server/hwc_blanking_control.cpp

src/platforms/android/server/hwc_fallback_gl_renderer.cpp

src/platforms/android/server/hwc_layers.cpp

src/platforms/android/server/platform.cpp

src/platforms/android/server/platform.h

src/platforms/android/utils/CMakeLists.txt

src/platforms/android/utils/render_overlays.cpp

src/platforms/common/server/kms-utils/drm_mode_resources.cpp

src/platforms/common/server/kms-utils/drm_mode_resources.h

src/platforms/common/server/kms-utils/kms_connector.cpp

src/platforms/common/server/kms-utils/kms_connector.h

src/platforms/common/server/shm_buffer.cpp

src/platforms/evdev/libinput_device.cpp

src/platforms/evdev/platform.cpp

src/platforms/mesa/client/client_platform_factory.cpp

src/platforms/mesa/server/kms/guest_platform.cpp

src/platforms/mesa/server/kms/guest_platform.h

src/platforms/mesa/server/kms/platform.cpp

src/platforms/mesa/server/kms/platform.h

src/platforms/mesa/server/kms/platform_symbols.cpp

src/platforms/mesa/server/kms/symbols.map.in

src/platforms/mesa/server/x11/graphics/display.cpp

src/platforms/mesa/server/x11/graphics/display.h

src/platforms/mesa/server/x11/graphics/display_configuration.cpp

src/platforms/mesa/server/x11/graphics/display_configuration.h

src/platforms/mesa/server/x11/graphics/guest_platform.cpp

src/platforms/mesa/server/x11/graphics/guest_platform.h

src/platforms/mesa/server/x11/graphics/platform.cpp

src/platforms/mesa/server/x11/graphics/platform.h

src/platforms/mesa/server/x11/input/input_device.cpp

src/platforms/mesa/server/x11/input/input_platform.cpp

src/protobuf/mir_protobuf.proto

src/renderers/gl/renderer.cpp

src/server/CMakeLists.txt

src/server/compositor/buffer_map.cpp

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/frontend/event_sender.cpp

src/server/frontend/event_sender.h

src/server/frontend/session_mediator.cpp

src/server/graphics/CMakeLists.txt

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/display.cpp

src/server/graphics/nested/display.h

src/server/graphics/nested/display_buffer.cpp

src/server/graphics/nested/display_buffer.h

src/server/graphics/nested/host_connection.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/mir_client_host_connection.h

src/server/input/android/input_sender.cpp

src/server/input/basic_seat.cpp

src/server/input/basic_seat.h

src/server/input/default_configuration.cpp

src/server/input/default_device.cpp

src/server/input/default_device.h

src/server/input/default_event_builder.cpp

src/server/input/default_event_builder.h

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/input/seat_input_device_tracker.cpp

src/server/input/seat_input_device_tracker.h

src/server/input/surface_input_dispatcher.cpp

src/server/input/surface_input_dispatcher.h

src/server/scene/CMakeLists.txt

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/default_configuration.cpp

src/server/scene/global_event_sender.cpp

src/server/scene/global_event_sender.h

src/server/scene/surface_allocator.cpp

src/server/server.cpp

src/server/shell/abstract_shell.cpp

src/server/shell/canonical_window_manager.cpp

src/server/shell/default_configuration.cpp

src/server/symbols.map

src/utils/run.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/server_configuration_options.cpp

tests/acceptance-tests/server_configuration_wrapping.cpp

tests/acceptance-tests/test_application_not_responding_detection.cpp

tests/acceptance-tests/test_buffer_stream_arrangement.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surface_swap_buffers.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_nested_input.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_surface_modifications.cpp

tests/acceptance-tests/test_surface_placement.cpp

tests/acceptance-tests/test_surface_specification.cpp

tests/acceptance-tests/test_system_compositor_window_manager.cpp

tests/acceptance-tests/throwback/test_presentation_chain.cpp

tests/include/mir/test/doubles/mock_client_context.h

tests/include/mir/test/doubles/mock_drm.h

tests/include/mir/test/doubles/mock_event_sink.h

tests/include/mir/test/doubles/mock_gl.h

tests/include/mir/test/doubles/mock_input_seat.h

tests/include/mir/test/doubles/mock_input_sink.h

tests/include/mir/test/doubles/mock_surface.h

tests/include/mir/test/doubles/mock_x11.h

tests/include/mir/test/doubles/null_event_sink.h

tests/include/mir/test/doubles/stub_host_connection.h

tests/include/mir/test/doubles/stub_scene_surface.h

tests/integration-tests/graphics/mesa/test_buffer_integration.cpp

tests/integration-tests/input/test_single_seat_setup.cpp

tests/integration-tests/surface_composition.cpp

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/integration-tests/test_test_framework.cpp

tests/mir_test_doubles/mock_drm.cpp

tests/mir_test_doubles/mock_egl.cpp

tests/mir_test_doubles/mock_event_sink_factory.cpp

tests/mir_test_doubles/mock_gl.cpp

tests/mir_test_doubles/mock_x11.cpp

tests/mir_test_framework/async_server_runner.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/platform_graphics_dummy.cpp

tests/mir_test_framework/platform_graphics_throw.cpp

tests/mir_test_framework/stub_client_platform_module.cpp

tests/mir_test_framework/stub_surface.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/mirtest.pc.in

tests/privileged-tests/test_input_events.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/CMakeLists.txt

tests/unit-tests/client/android/test_android_native_window.cpp

tests/unit-tests/client/input/test_xkb_mapper.cpp

tests/unit-tests/client/mesa/test_client_platform.cpp

tests/unit-tests/client/test_buffer_vault.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_client_platform.cpp

tests/unit-tests/client/test_mir_buffer.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/client/test_presentation_chain.cpp

tests/unit-tests/client/test_probing_client_platform_factory.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/compositor/test_client_buffers.cpp

tests/unit-tests/frontend/test_event_sender.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/android/CMakeLists.txt

tests/unit-tests/graphics/android/test_device_detection.cpp

tests/unit-tests/graphics/android/test_display.cpp

tests/unit-tests/graphics/android/test_display_buffer.cpp

tests/unit-tests/graphics/android/test_display_generic.cpp

tests/unit-tests/graphics/android/test_display_hotplug.cpp

tests/unit-tests/graphics/android/test_hwc_configuration.cpp

tests/unit-tests/graphics/android/test_hwc_layers.cpp

tests/unit-tests/graphics/android/test_platform.cpp

tests/unit-tests/graphics/android/test_server_interpreter.cpp

tests/unit-tests/graphics/kms-utils/CMakeLists.txt

tests/unit-tests/graphics/mesa/kms/test_platform.cpp

tests/unit-tests/graphics/mesa/x11/test_display.cpp

tests/unit-tests/graphics/nested/test_nested_display.cpp

tests/unit-tests/graphics/test_platform_prober.cpp

tests/unit-tests/graphics/test_shm_buffer.cpp

tests/unit-tests/input/CMakeLists.txt

tests/unit-tests/input/android/test_android_input_sender.cpp

tests/unit-tests/input/android/test_input_consumer.cpp

tests/unit-tests/input/evdev/test_libinput_device.cpp

tests/unit-tests/input/test_default_device.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_event_builders.cpp

tests/unit-tests/input/test_key_repeat_dispatcher.cpp

tests/unit-tests/input/test_seat_input_device_tracker.cpp

tests/unit-tests/input/test_surface_input_dispatcher.cpp

tests/unit-tests/input/test_x11_platform.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Show diffs side-by-side

added added

removed removed

src/platforms/android/utils/CMakeLists.txt

${CMAKE_CURRENT_SOURCE_DIR}/android_graphics_region_factory.cpp

)

add_definitions(-DMIR_SERVER_GRAPHICS_PLATFORM_VERSION="${MIR_SERVER_GRAPHICS_PLATFORM_VERSION}")

include_directories(

${PROJECT_SOURCE_DIR}/include/server

${PROJECT_SOURCE_DIR}/include/client

)

target_link_libraries(mir_demo_standalone_render_overlays

mirserver

mircommon

mirplatform

)

install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mir_android_diagnostics

Older »