Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(412)

Side by Side Diff: device/bluetooth/bluetooth.gyp

Issue 1165053003: Adding support for Low Energy device discovery to BluetoothAdapterMac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: adding issue # Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 {
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 'test/mock_bluetooth_gatt_connection.h', 224 'test/mock_bluetooth_gatt_connection.h',
225 'test/mock_bluetooth_gatt_descriptor.cc', 225 'test/mock_bluetooth_gatt_descriptor.cc',
226 'test/mock_bluetooth_gatt_descriptor.h', 226 'test/mock_bluetooth_gatt_descriptor.h',
227 'test/mock_bluetooth_gatt_notify_session.cc', 227 'test/mock_bluetooth_gatt_notify_session.cc',
228 'test/mock_bluetooth_gatt_notify_session.h', 228 'test/mock_bluetooth_gatt_notify_session.h',
229 'test/mock_bluetooth_gatt_service.cc', 229 'test/mock_bluetooth_gatt_service.cc',
230 'test/mock_bluetooth_gatt_service.h', 230 'test/mock_bluetooth_gatt_service.h',
231 'test/mock_bluetooth_socket.cc', 231 'test/mock_bluetooth_socket.cc',
232 'test/mock_bluetooth_socket.h', 232 'test/mock_bluetooth_socket.h',
233 ], 233 ],
234 'conditions': [
235 ['OS=="mac"', {
armansito 2015/06/09 19:32:58 Is this check needed?
krstnmnlsn 2015/06/09 23:09:00 Nope, apparently not :)
236 'sources': [
237 'test/mock_bluetooth_central_manager_mac.mm',
238 'test/mock_bluetooth_central_manager_mac.h',
239 ],
240 }],
241 ],
234 }, 242 },
235 ], 243 ],
236 'conditions': [ 244 'conditions': [
237 ['OS == "android"', { 245 ['OS == "android"', {
238 'targets': [ 246 'targets': [
239 { 247 {
240 'target_name': 'device_bluetooth_jni_headers', 248 'target_name': 'device_bluetooth_jni_headers',
241 'type': 'none', 249 'type': 'none',
242 'sources': [ 250 'sources': [
243 'android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.jav a', 251 'android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.jav a',
(...skipping 11 matching lines...) Expand all
255 ], 263 ],
256 'variables': { 264 'variables': {
257 'java_in_dir': '../../device/bluetooth/android/java', 265 'java_in_dir': '../../device/bluetooth/android/java',
258 }, 266 },
259 'includes': [ '../../build/java.gypi' ], 267 'includes': [ '../../build/java.gypi' ],
260 }, 268 },
261 ], 269 ],
262 }], 270 }],
263 ], 271 ],
264 } 272 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698