 Chromium Code Reviews
 Chromium Code Reviews Issue 1165053003:
  Adding support for Low Energy device discovery to BluetoothAdapterMac  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 1165053003:
  Adding support for Low Energy device discovery to BluetoothAdapterMac  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW | 
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//tools/grit/grit_rule.gni") | 5 import("//tools/grit/grit_rule.gni") | 
| 6 | 6 | 
| 7 if (is_android) { | 7 if (is_android) { | 
| 8 import("//build/config/android/rules.gni") # For generate_jni(). | 8 import("//build/config/android/rules.gni") # For generate_jni(). | 
| 9 } | 9 } | 
| 10 | 10 | 
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 210 ] | 210 ] | 
| 211 } | 211 } | 
| 212 | 212 | 
| 213 static_library("mocks") { | 213 static_library("mocks") { | 
| 214 testonly = true | 214 testonly = true | 
| 215 sources = [ | 215 sources = [ | 
| 216 "test/mock_bluetooth_adapter.cc", | 216 "test/mock_bluetooth_adapter.cc", | 
| 217 "test/mock_bluetooth_adapter.h", | 217 "test/mock_bluetooth_adapter.h", | 
| 218 "test/mock_bluetooth_advertisement.cc", | 218 "test/mock_bluetooth_advertisement.cc", | 
| 219 "test/mock_bluetooth_advertisement.h", | 219 "test/mock_bluetooth_advertisement.h", | 
| 220 "test/mock_bluetooth_central_manager.h", | |
| 
scheib
2015/06/05 18:10:20
Mac specific files should only be built on that pl
 
krstnmnlsn
2015/06/09 01:08:09
Alright, please check if I've got it correct now.
 | |
| 221 "test/mock_bluetooth_central_manager.mm", | |
| 220 "test/mock_bluetooth_device.cc", | 222 "test/mock_bluetooth_device.cc", | 
| 221 "test/mock_bluetooth_device.h", | 223 "test/mock_bluetooth_device.h", | 
| 222 "test/mock_bluetooth_discovery_session.cc", | 224 "test/mock_bluetooth_discovery_session.cc", | 
| 223 "test/mock_bluetooth_discovery_session.h", | 225 "test/mock_bluetooth_discovery_session.h", | 
| 224 "test/mock_bluetooth_gatt_characteristic.cc", | 226 "test/mock_bluetooth_gatt_characteristic.cc", | 
| 225 "test/mock_bluetooth_gatt_characteristic.h", | 227 "test/mock_bluetooth_gatt_characteristic.h", | 
| 226 "test/mock_bluetooth_gatt_connection.cc", | 228 "test/mock_bluetooth_gatt_connection.cc", | 
| 227 "test/mock_bluetooth_gatt_connection.h", | 229 "test/mock_bluetooth_gatt_connection.h", | 
| 228 "test/mock_bluetooth_gatt_descriptor.cc", | 230 "test/mock_bluetooth_gatt_descriptor.cc", | 
| 229 "test/mock_bluetooth_gatt_descriptor.h", | 231 "test/mock_bluetooth_gatt_descriptor.h", | 
| (...skipping 14 matching lines...) Expand all Loading... | |
| 244 } | 246 } | 
| 245 | 247 | 
| 246 if (is_android) { | 248 if (is_android) { | 
| 247 generate_jni("bluetooth_jni") { | 249 generate_jni("bluetooth_jni") { | 
| 248 sources = [ | 250 sources = [ | 
| 249 "android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.java", | 251 "android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.java", | 
| 250 ] | 252 ] | 
| 251 jni_package = "bluetooth" | 253 jni_package = "bluetooth" | 
| 252 } | 254 } | 
| 253 } | 255 } | 
| OLD | NEW |