diff options
| author | slan <slan@chromium.org> | 2015-11-10 13:19:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-10 21:19:47 +0000 |
| commit | 06c6305d0c309423a7e415eef22da864fd234c56 (patch) | |
| tree | 6d5569b60a84e44fa788fdb3d9fd1389e04853a9 /device/hid | |
| parent | d7eefce9eccb2768ef97058ea6241173c971048e (diff) | |
| download | chromium_src-06c6305d0c309423a7e415eef22da864fd234c56.zip chromium_src-06c6305d0c309423a7e415eef22da864fd234c56.tar.gz chromium_src-06c6305d0c309423a7e415eef22da864fd234c56.tar.bz2 | |
[GN] Only include udev sources in //device/hid when use_udev is true.
Builds with udev diabled will fail when the udev headers are built. Move
all source inside a condition that prevents this. Includes of these
headers are already guarded with USE_UDEV in the source. Verified with
an internal Chromecast GN build, which does not use udev.
BUG=
Review URL: https://codereview.chromium.org/1416673011
Cr-Commit-Position: refs/heads/master@{#358903}
Diffstat (limited to 'device/hid')
| -rw-r--r-- | device/hid/BUILD.gn | 21 | ||||
| -rw-r--r-- | device/hid/hid.gyp | 18 |
2 files changed, 16 insertions, 23 deletions
diff --git a/device/hid/BUILD.gn b/device/hid/BUILD.gn index f57fe86..9288f70 100644 --- a/device/hid/BUILD.gn +++ b/device/hid/BUILD.gn @@ -6,10 +6,6 @@ import("//build/config/features.gni") source_set("hid") { sources = [ - "device_monitor_linux.cc", - "device_monitor_linux.h", - "fake_input_service_linux.cc", - "fake_input_service_linux.h", "hid_collection_info.cc", "hid_collection_info.h", "hid_connection.cc", @@ -32,16 +28,12 @@ source_set("hid") { "hid_report_descriptor_item.h", "hid_service.cc", "hid_service.h", - "hid_service_linux.cc", - "hid_service_linux.h", "hid_service_mac.cc", "hid_service_mac.h", "hid_service_win.cc", "hid_service_win.h", "hid_usage_and_page.cc", "hid_usage_and_page.h", - "input_service_linux.cc", - "input_service_linux.h", ] deps = [ @@ -51,9 +43,20 @@ source_set("hid") { "//net", ] - if (use_udev) { + if (is_linux && use_udev) { + sources += [ + "device_monitor_linux.cc", + "device_monitor_linux.h", + "fake_input_service_linux.cc", + "fake_input_service_linux.h", + "hid_service_linux.cc", + "hid_service_linux.h", + "input_service_linux.cc", + "input_service_linux.h", + ] deps += [ "//device/udev_linux" ] } + if (is_chromeos) { deps += [ "//chromeos" ] } diff --git a/device/hid/hid.gyp b/device/hid/hid.gyp index 00b9a90..f7a0baf 100644 --- a/device/hid/hid.gyp +++ b/device/hid/hid.gyp @@ -19,10 +19,6 @@ '../core/core.gyp:device_core', ], 'sources': [ - 'device_monitor_linux.cc', - 'device_monitor_linux.h', - 'fake_input_service_linux.cc', - 'fake_input_service_linux.h', 'hid_collection_info.cc', 'hid_collection_info.h', 'hid_connection.cc', @@ -45,31 +41,25 @@ 'hid_report_descriptor_item.h', 'hid_service.cc', 'hid_service.h', - 'hid_service_linux.cc', - 'hid_service_linux.h', 'hid_service_mac.cc', 'hid_service_mac.h', 'hid_service_win.cc', 'hid_service_win.h', 'hid_usage_and_page.cc', 'hid_usage_and_page.h', - 'input_service_linux.cc', - 'input_service_linux.h', ], 'conditions': [ - ['use_udev==1', { + ['OS=="linux" and use_udev==1', { 'dependencies': [ '../udev_linux/udev.gyp:udev_linux', ], - }, { # use_udev==0 - # The Linux implementation is based on Udev. - 'sources!': [ + 'sources': [ 'device_monitor_linux.cc', 'device_monitor_linux.h', - 'hid_service_linux.cc', - 'hid_service_linux.h', 'fake_input_service_linux.cc', 'fake_input_service_linux.h', + 'hid_service_linux.cc', + 'hid_service_linux.h', 'input_service_linux.cc', 'input_service_linux.h', ], |