diff options
| author | youngki@chromium.org <youngki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 18:01:01 +0000 |
|---|---|---|
| committer | youngki@chromium.org <youngki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 18:01:01 +0000 |
| commit | 06eaeb44ab3115e27b90f1fdec5572885c841b85 (patch) | |
| tree | b9b32e39a7c6ec88dd5d846a0af6f49125fd3fba /device/device.gyp | |
| parent | 06d512686f490a2750e91075e5a32cd58363033b (diff) | |
| download | chromium_src-06eaeb44ab3115e27b90f1fdec5572885c841b85.zip chromium_src-06eaeb44ab3115e27b90f1fdec5572885c841b85.tar.gz chromium_src-06eaeb44ab3115e27b90f1fdec5572885c841b85.tar.bz2 | |
Added 'chromium_code': 1 into variable block in device.gyp because without this
the files with _win and _chromeos won't be automatically excluded for the
platforms not supported. More discussions:
https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/8HGHz0tLXJs/discussion
Also I renamed bluetooth_adapter_chromeos_devices_unittest.cc as
bluetooth_adapter_devices_chromeos_unittest.cc because build/filename_rules.gypi
specifies that it will exclude _chromeos(_unittest)?\\.(h|cc).
BUG=
Review URL: https://chromiumcodereview.appspot.com/11260003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/device.gyp')
| -rw-r--r-- | device/device.gyp | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/device/device.gyp b/device/device.gyp index 675b8a0..d1f27e4 100644 --- a/device/device.gyp +++ b/device/device.gyp @@ -4,6 +4,7 @@ { 'variables': { + 'chromium_code': 1, }, 'targets': [ { @@ -41,17 +42,7 @@ 'bluetooth/bluetooth_utils.h', ], 'conditions': [ - ['chromeos==0', { - 'sources!': [ - # ChromeOs-only; exclude on other platforms. - 'bluetooth/bluetooth_adapter_chromeos.cc', - 'bluetooth/bluetooth_adapter_chromeos.h', - 'bluetooth/bluetooth_device_chromeos.cc', - 'bluetooth/bluetooth_device_chromeos.h', - 'bluetooth/bluetooth_socket_chromeos.cc', - 'bluetooth/bluetooth_socket_chromeos.h', - ] - }, { # chromeos==1 + ['chromeos==1', { 'dependencies': [ '../build/linux/system.gyp:dbus', '../chromeos/chromeos.gyp:chromeos', @@ -90,7 +81,7 @@ ], 'sources': [ 'bluetooth/bluetooth_adapter_chromeos_unittest.cc', - 'bluetooth/bluetooth_adapter_chromeos_devices_unittest.cc', + 'bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc', 'bluetooth/bluetooth_service_record_unittest.cc', 'bluetooth/bluetooth_utils_unittest.cc', 'test/device_test_suite.cc', @@ -98,13 +89,7 @@ 'test/run_all_unittests.cc', ], 'conditions': [ - ['chromeos==0', { - 'sources!': [ - # ChromeOs-only; exclude on other platforms. - 'bluetooth/bluetooth_adapter_chromeos_unittest.cc', - 'bluetooth/bluetooth_adapter_chromeos_devices_unittest.cc', - ] - }, { # chromeos==1 + ['chromeos==1', { 'dependencies': [ '../build/linux/system.gyp:dbus', '../chromeos/chromeos.gyp:chromeos_test_support', |