Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| 11 'target_name': 'device_unittests', | 11 'target_name': 'device_unittests', |
| 12 'type': '<(gtest_target_type)', | 12 'type': '<(gtest_target_type)', |
| 13 'dependencies': [ | 13 'dependencies': [ |
| 14 '../base/base.gyp:test_support_base', | 14 '../base/base.gyp:test_support_base', |
| 15 '../mojo/mojo_base.gyp:mojo_environment_chromium', | 15 '../mojo/mojo_base.gyp:mojo_environment_chromium', |
| 16 '../testing/gmock.gyp:gmock', | 16 '../testing/gmock.gyp:gmock', |
| 17 '../testing/gtest.gyp:gtest', | 17 '../testing/gtest.gyp:gtest', |
| 18 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', | 18 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', |
| 19 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', | 19 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', |
| 20 '../third_party/ocmock/ocmock.gyp:ocmock', | |
| 20 '../tools/usb_gadget/usb_gadget.gyp:usb_gadget', | 21 '../tools/usb_gadget/usb_gadget.gyp:usb_gadget', |
| 21 'battery/battery.gyp:device_battery', | 22 'battery/battery.gyp:device_battery', |
| 22 'battery/battery.gyp:device_battery_mojo_bindings', | 23 'battery/battery.gyp:device_battery_mojo_bindings', |
| 23 'bluetooth/bluetooth.gyp:device_bluetooth', | 24 'bluetooth/bluetooth.gyp:device_bluetooth', |
| 24 'bluetooth/bluetooth.gyp:device_bluetooth_mocks', | 25 'bluetooth/bluetooth.gyp:device_bluetooth_mocks', |
| 25 'core/core.gyp:device_core', | 26 'core/core.gyp:device_core', |
| 26 'devices_app/devices_app.gyp:devices_app_lib', | 27 'devices_app/devices_app.gyp:devices_app_lib', |
| 27 'nfc/nfc.gyp:device_nfc', | 28 'nfc/nfc.gyp:device_nfc', |
| 28 'usb/usb.gyp:device_usb', | 29 'usb/usb.gyp:device_usb', |
| 29 'usb/usb.gyp:device_usb_mocks', | 30 'usb/usb.gyp:device_usb_mocks', |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 106 ['exclude', '(^|/)serial'], | 107 ['exclude', '(^|/)serial'], |
| 107 ['exclude', '(^|/)usb'], | 108 ['exclude', '(^|/)usb'], |
| 108 ], | 109 ], |
| 109 }], | 110 }], |
| 110 ['OS=="mac"', { | 111 ['OS=="mac"', { |
| 111 'link_settings': { | 112 'link_settings': { |
| 112 'libraries': [ | 113 'libraries': [ |
| 113 '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework', | 114 '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework', |
| 114 ], | 115 ], |
| 115 }, | 116 }, |
| 117 'xcode_settings' : { | |
| 118 'OTHER_LDFLAGS' : [ | |
| 119 '-ObjC', | |
|
krstnmnlsn
2015/07/01 16:45:50
Is there an equivalent flag needed in the .gn file
scheib
2015/07/01 17:29:44
Probably. I'm not familiar with the flag, but I se
krstnmnlsn
2015/07/02 00:25:30
Ok. For some reason I missed those.
| |
| 120 ], | |
| 121 }, | |
| 116 }], | 122 }], |
| 117 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { | 123 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { |
| 118 'conditions': [ | 124 'conditions': [ |
| 119 ['use_allocator!="none"', { | 125 ['use_allocator!="none"', { |
| 120 'dependencies': [ | 126 'dependencies': [ |
| 121 '../base/allocator/allocator.gyp:allocator', | 127 '../base/allocator/allocator.gyp:allocator', |
| 122 ], | 128 ], |
| 123 }], | 129 }], |
| 124 ], | 130 ], |
| 125 }], | 131 }], |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 163 ], | 169 ], |
| 164 'variables': { | 170 'variables': { |
| 165 'test_suite_name': 'device_unittests', | 171 'test_suite_name': 'device_unittests', |
| 166 }, | 172 }, |
| 167 'includes': [ '../build/apk_test.gypi' ], | 173 'includes': [ '../build/apk_test.gypi' ], |
| 168 }, | 174 }, |
| 169 ], | 175 ], |
| 170 }], | 176 }], |
| 171 ], | 177 ], |
| 172 } | 178 } |
| OLD | NEW |