Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Unified Diff: ui/ozone/platform/drm/gbm.gypi

Issue 1350473002: Revert of ozone: Remove the "drm" software composited platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/drm/drm.gypi ('k') | ui/ozone/platform/drm/gpu/drm_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gbm.gypi
diff --git a/ui/ozone/platform/drm/gbm.gypi b/ui/ozone/platform/drm/gbm.gypi
index 2395ac1cd5975a1ff79dd82cd5696b7b1709e463..cc852a2b59e191b54ac0adf8c1e68681ab2538c2 100644
--- a/ui/ozone/platform/drm/gbm.gypi
+++ b/ui/ozone/platform/drm/gbm.gypi
@@ -29,16 +29,11 @@
'../../skia/skia.gyp:skia',
'../../third_party/khronos/khronos.gyp:khronos_headers',
'../base/ui_base.gyp:ui_base',
- '../display/display.gyp:display_types',
- '../display/display.gyp:display_util',
- '../events/devices/events_devices.gyp:events_devices',
'../events/events.gyp:events',
'../events/ozone/events_ozone.gyp:events_ozone',
'../events/ozone/events_ozone.gyp:events_ozone_evdev',
'../events/ozone/events_ozone.gyp:events_ozone_layout',
- '../events/platform/events_platform.gyp:events_platform',
'../gfx/gfx.gyp:gfx',
- '../gfx/gfx.gyp:gfx_geometry',
],
'defines': [
'OZONE_IMPLEMENTATION',
@@ -46,33 +41,6 @@
'sources': [
'common/client_native_pixmap_factory_gbm.cc',
'common/client_native_pixmap_factory_gbm.h',
- 'common/drm_util.cc',
- 'common/drm_util.h',
- 'common/scoped_drm_types.cc',
- 'common/scoped_drm_types.h',
- 'gpu/crtc_controller.cc',
- 'gpu/crtc_controller.h',
- 'gpu/display_change_observer.h',
- 'gpu/drm_buffer.cc',
- 'gpu/drm_buffer.h',
- 'gpu/drm_console_buffer.cc',
- 'gpu/drm_console_buffer.h',
- 'gpu/drm_device.cc',
- 'gpu/drm_device.h',
- 'gpu/drm_device_generator.cc',
- 'gpu/drm_device_generator.h',
- 'gpu/drm_device_manager.cc',
- 'gpu/drm_device_manager.h',
- 'gpu/drm_display.cc',
- 'gpu/drm_display.h',
- 'gpu/drm_gpu_display_manager.cc',
- 'gpu/drm_gpu_display_manager.h',
- 'gpu/drm_gpu_platform_support.cc',
- 'gpu/drm_gpu_platform_support.h',
- 'gpu/drm_vsync_provider.cc',
- 'gpu/drm_vsync_provider.h',
- 'gpu/drm_window.cc',
- 'gpu/drm_window.h',
'gpu/gbm_buffer.cc',
'gpu/gbm_buffer.h',
'gpu/gbm_buffer_base.cc',
@@ -85,41 +53,6 @@
'gpu/gbm_surface_factory.h',
'gpu/gbm_surfaceless.cc',
'gpu/gbm_surfaceless.h',
- 'gpu/hardware_display_controller.cc',
- 'gpu/hardware_display_controller.h',
- 'gpu/hardware_display_plane.cc',
- 'gpu/hardware_display_plane.h',
- 'gpu/hardware_display_plane_manager.cc',
- 'gpu/hardware_display_plane_manager.h',
- 'gpu/hardware_display_plane_manager_legacy.cc',
- 'gpu/hardware_display_plane_manager_legacy.h',
- 'gpu/overlay_plane.cc',
- 'gpu/overlay_plane.h',
- 'gpu/page_flip_request.cc',
- 'gpu/page_flip_request.h',
- 'gpu/screen_manager.cc',
- 'gpu/screen_manager.h',
- 'host/channel_observer.h',
- 'host/drm_cursor.cc',
- 'host/drm_cursor.h',
- 'host/drm_device_handle.cc',
- 'host/drm_device_handle.h',
- 'host/drm_display_host.cc',
- 'host/drm_display_host.h',
- 'host/drm_display_host_manager.cc',
- 'host/drm_display_host_manager.h',
- 'host/drm_gpu_platform_support_host.cc',
- 'host/drm_gpu_platform_support_host.h',
- 'host/drm_native_display_delegate.cc',
- 'host/drm_native_display_delegate.h',
- 'host/drm_overlay_candidates_host.cc',
- 'host/drm_overlay_candidates_host.h',
- 'host/drm_overlay_manager.cc',
- 'host/drm_overlay_manager.h',
- 'host/drm_window_host.cc',
- 'host/drm_window_host.h',
- 'host/drm_window_host_manager.cc',
- 'host/drm_window_host_manager.h',
'ozone_platform_gbm.cc',
'ozone_platform_gbm.h',
],
@@ -134,44 +67,10 @@
'gpu/client_native_pixmap_vgem.h',
],
}],
- ['use_drm_atomic == 1', {
- 'sources': [
- 'gpu/hardware_display_plane_atomic.cc',
- 'gpu/hardware_display_plane_atomic.h',
- 'gpu/hardware_display_plane_manager_atomic.cc',
- 'gpu/hardware_display_plane_manager_atomic.h',
- ],
- 'defines': [
- 'USE_DRM_ATOMIC=1',
- ],
+ ['use_drm_atomic==1', {
+ 'defines': ['USE_DRM_ATOMIC'],
}],
],
},
- {
- 'target_name': 'ozone_platform_gbm_unittests',
- 'type': 'none',
- 'dependencies': [
- '../../build/linux/system.gyp:libdrm',
- '../../skia/skia.gyp:skia',
- '../gfx/gfx.gyp:gfx',
- '../gfx/gfx.gyp:gfx_geometry',
- 'ozone.gyp:ozone',
- ],
- 'export_dependent_settings': [
- '../../build/linux/system.gyp:libdrm',
- '../../skia/skia.gyp:skia',
- '../gfx/gfx.gyp:gfx_geometry',
- ],
- 'direct_dependent_settings': {
- 'sources': [
- 'gpu/drm_window_unittest.cc',
- 'gpu/hardware_display_controller_unittest.cc',
- 'gpu/hardware_display_plane_manager_unittest.cc',
- 'gpu/screen_manager_unittest.cc',
- 'test/mock_drm_device.cc',
- 'test/mock_drm_device.h',
- ],
- },
- },
],
}
« no previous file with comments | « ui/ozone/platform/drm/drm.gypi ('k') | ui/ozone/platform/drm/gpu/drm_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698