Chromium Code Reviews| Index: ui/aura/aura.gyp |
| diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp |
| index efaa46368ca11f50adfcaefda02822c41eb007a7..d4e241ca902dbefd18eb6ffcc42ed84d0599ee40 100644 |
| --- a/ui/aura/aura.gyp |
| +++ b/ui/aura/aura.gyp |
| @@ -108,10 +108,8 @@ |
| 'window_tree_host_mac.h', |
| 'window_tree_host_mac.mm', |
| 'window_tree_host_observer.h', |
| - 'window_tree_host_ozone.cc', |
| - 'window_tree_host_ozone.h', |
| - 'window_tree_host_win.cc', |
| - 'window_tree_host_win.h', |
| + 'window_tree_host_platform.cc', |
| + 'window_tree_host_platform.h', |
| 'window_tree_host_x11.cc', |
| 'window_tree_host_x11.h', |
| ], |
| @@ -142,6 +140,17 @@ |
| '../ozone/ozone.gyp:ozone_base', |
| ], |
| }], |
| + ['(OS=="mac" or use_x11==1) and use_ozone==0', { |
|
mfomitchev
2015/10/09 21:24:18
Same as for gn
|
| + 'sources!': [ |
| + 'window_tree_host_platform.cc', |
| + 'window_tree_host_platform.h', |
| + ], |
| + }], |
| + ['OS=="android"', { |
| + 'dependencies': [ |
| + '../platform_window/android/android_window.gyp:android_window', |
|
mfomitchev
2015/10/09 21:24:18
same as for gn
no sievers
2015/10/09 21:41:14
Done.
no sievers
2015/10/09 21:41:14
gyp should be ok since it's transitive.
|
| + ], |
| + }], |
| ], |
| }, |
| { |