diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 00:27:32 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 00:27:32 +0000 |
| commit | 49ce8718cb55f7823e2d8066ad2eec60d738b416 (patch) | |
| tree | 047bf65398b2c0172e3c48515bf1b99e84bcc76c | |
| parent | 53a8bf975a88a6461e771c1c5bc1dec9037985c2 (diff) | |
| download | chromium_src-49ce8718cb55f7823e2d8066ad2eec60d738b416.zip chromium_src-49ce8718cb55f7823e2d8066ad2eec60d738b416.tar.gz chromium_src-49ce8718cb55f7823e2d8066ad2eec60d738b416.tar.bz2 | |
GN fixes for the Windows build.
R=scottmg@chromium.org
TBR=scottmg
Review URL: https://codereview.chromium.org/404603002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283946 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/BUILD.gn | 8 | ||||
| -rw-r--r-- | ash/ash.gyp | 1 | ||||
| -rw-r--r-- | chrome/chrome_browser_extensions.gypi | 10 | ||||
| -rw-r--r-- | components/storage_monitor/BUILD.gn | 3 | ||||
| -rw-r--r-- | ui/views/BUILD.gn | 9 |
5 files changed, 18 insertions, 13 deletions
diff --git a/ash/BUILD.gn b/ash/BUILD.gn index f27a5a4..9b610d7 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn @@ -56,7 +56,6 @@ component("ash") { if (is_win) { sources -= [ - "host/window_tree_host_factory.cc", "sticky_keys/sticky_keys_controller.cc", "sticky_keys/sticky_keys_controller.h", ] @@ -76,8 +75,6 @@ component("ash") { "accelerators/magnifier_key_scroller.h", "accelerators/spoken_feedback_toggler.cc", "accelerators/spoken_feedback_toggler.h", - "touch/touch_transformer_controller.cc", - "touch/touch_transformer_controller.h", ] } @@ -102,6 +99,11 @@ component("ash") { "system/tray/media_security/media_capture_observer.h", "system/tray/media_security/multi_profile_media_tray_item.cc", "system/tray/media_security/multi_profile_media_tray_item.h", + ] + } + + if (!use_x11 || !is_chromeos) { + sources -= [ "touch/touch_transformer_controller.cc", "touch/touch_transformer_controller.h", ] diff --git a/ash/ash.gyp b/ash/ash.gyp index 544f089..b47fbb9 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -916,7 +916,6 @@ ['OS=="win"', { 'sources!': [ # Note: sources list duplicated in GN build. - "host/window_tree_host_factory.cc", "sticky_keys/sticky_keys_controller.cc", "sticky_keys/sticky_keys_controller.h", ], diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index 0807950..f2a4a25 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -682,12 +682,6 @@ 'browser/extensions/api/music_manager_private/device_id_win.cc', 'browser/extensions/api/music_manager_private/music_manager_private_api.cc', 'browser/extensions/api/music_manager_private/music_manager_private_api.h', - 'browser/extensions/api/networking_private/networking_private_api.h', - 'browser/extensions/api/networking_private/networking_private_api_chromeos.cc', - 'browser/extensions/api/networking_private/networking_private_event_router.h', - 'browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc', - 'browser/extensions/api/networking_private/networking_private_event_router_factory.cc', - 'browser/extensions/api/networking_private/networking_private_event_router_factory.h', 'browser/extensions/api/notifications/notifications_api.cc', 'browser/extensions/api/notifications/notifications_api.h', 'browser/extensions/api/omnibox/omnibox_api.cc', @@ -907,11 +901,15 @@ ], 'chrome_browser_extensions_networking_private_sources': [ 'browser/extensions/api/networking_private/networking_private_api.h', + 'browser/extensions/api/networking_private/networking_private_api.h', + 'browser/extensions/api/networking_private/networking_private_api_chromeos.cc', 'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc', 'browser/extensions/api/networking_private/networking_private_credentials_getter.h', 'browser/extensions/api/networking_private/networking_private_credentials_getter_mac.cc', 'browser/extensions/api/networking_private/networking_private_credentials_getter_win.cc', 'browser/extensions/api/networking_private/networking_private_event_router.h', + 'browser/extensions/api/networking_private/networking_private_event_router.h', + 'browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc', 'browser/extensions/api/networking_private/networking_private_event_router_factory.cc', 'browser/extensions/api/networking_private/networking_private_event_router_factory.h', 'browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc', diff --git a/components/storage_monitor/BUILD.gn b/components/storage_monitor/BUILD.gn index d0404c9..a6e02b1 100644 --- a/components/storage_monitor/BUILD.gn +++ b/components/storage_monitor/BUILD.gn @@ -66,7 +66,8 @@ static_library("storage_monitor") { deps += [ "//device/udev_linux", ] - } else { + } else if (is_linux) { + # These were already removed for non-Linux. sources -= [ "storage_monitor_linux.cc", "storage_monitor_linux.h", diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn index 8839d0f..f572463 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn @@ -58,13 +58,18 @@ component("views") { sources -= [ "linux_ui/linux_ui.h", "linux_ui/linux_ui.cc", - "linux_ui/status_icon_linux.h", - "linux_ui/status_icon_linux.cc", "linux_ui/window_button_order_observer.h", "linux_ui/window_button_order_provider.cc", ] } + if (is_chromeos) { + sources -= [ + "linux_ui/status_icon_linux.h", + "linux_ui/status_icon_linux.cc", + ] + } + if (is_win) { sources += gypi_values.views_win_sources cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |