diff options
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 19:37:01 +0000 |
|---|---|---|
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 19:37:01 +0000 |
| commit | 10d8d02f689d9b8bb429f4839ac2539904290b85 (patch) | |
| tree | 7d55e6bdb62c3860d805846ee998eca1e108b7f2 | |
| parent | 57cd3d24748da3060fa42b70979a4c0390139ba1 (diff) | |
| download | chromium_src-10d8d02f689d9b8bb429f4839ac2539904290b85.zip chromium_src-10d8d02f689d9b8bb429f4839ac2539904290b85.tar.gz chromium_src-10d8d02f689d9b8bb429f4839ac2539904290b85.tar.bz2 | |
Fix components_unittests embedded build
BUG=none
TEST=embedded=1 build
NOTRY=true
TBR=dnicoara
Review URL: https://codereview.chromium.org/317823005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275219 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | components/components_tests.gyp | 8 | ||||
| -rw-r--r-- | device/device_tests.gyp | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp index f08ecc3..5c13b54 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -489,10 +489,12 @@ ['OS=="linux" and use_udev==0', { 'dependencies!': [ '../third_party/libusb/libusb.gyp:libusb', + 'components.gyp:storage_monitor', + 'components.gyp:storage_monitor_test_support', ], - 'sources!': [ - 'storage_monitor/storage_monitor_linux_unittest.cc', - 'usb_service/usb_context_unittest.cc', + 'sources/': [ + ['exclude', '^storage_monitor/'], + ['exclude', '^usb_service/'], ], }], ['OS=="win" and win_use_allocator_shim==1', { diff --git a/device/device_tests.gyp b/device/device_tests.gyp index 9809e62..d3ec0b6 100644 --- a/device/device_tests.gyp +++ b/device/device_tests.gyp @@ -70,10 +70,11 @@ ['OS=="linux" and use_udev==0', { # Udev is the only Linux implementation. If we're compiling without # Udev, disable these unittests. - 'sources!': [ - 'hid/hid_connection_unittest.cc', - 'hid/hid_service_unittest.cc', - 'hid/input_service_linux_unittest.cc', + 'dependencies!': [ + 'hid/hid.gyp:device_hid', + ], + 'sources/': [ + ['exclude', '^hid/'], ], }], ], |