Index: mojo/mojo_services.gypi |
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi |
index 58f8ca8466a3ad5cc8a7f2eac768304d060a101a..735039408416e9c96ae43969d9a3d1249adf96d8 100644 |
--- a/mojo/mojo_services.gypi |
+++ b/mojo/mojo_services.gypi |
@@ -313,12 +313,10 @@ |
'services/native_viewport/native_viewport.h', |
'services/native_viewport/native_viewport_android.cc', |
'services/native_viewport/native_viewport_mac.mm', |
- 'services/native_viewport/native_viewport_ozone.cc', |
'services/native_viewport/native_viewport_service.cc', |
'services/native_viewport/native_viewport_service.h', |
'services/native_viewport/native_viewport_stub.cc', |
- 'services/native_viewport/native_viewport_win.cc', |
- 'services/native_viewport/native_viewport_x11.cc', |
+ 'services/native_viewport/platform_viewport.cc', |
], |
'conditions': [ |
['OS=="win" or OS=="android" or OS=="linux" or OS=="mac"', { |
@@ -331,14 +329,13 @@ |
'mojo_jni_headers', |
], |
}], |
- ['OS=="win"', { |
+ ['use_x11==1 or use_ozone==1 or OS=="win"', { |
'dependencies': [ |
- '../ui/platform_window/win/win_window.gyp:win_window', |
+ '../ui/platform_window/platform_window.gyp:platform_window', |
], |
- }], |
- ['use_x11==1', { |
- 'dependencies': [ |
- '../ui/platform_window/x11/x11_window.gyp:x11_window', |
+ }, { |
+ 'sources!': [ |
+ 'services/native_viewport/platform_viewport.cc', |
], |
}], |
], |