Chromium Code Reviews| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 "bluetooth_advertisement.cc", | 42 "bluetooth_advertisement.cc", |
| 43 "bluetooth_advertisement.h", | 43 "bluetooth_advertisement.h", |
| 44 "bluetooth_advertisement_chromeos.cc", | 44 "bluetooth_advertisement_chromeos.cc", |
| 45 "bluetooth_advertisement_chromeos.h", | 45 "bluetooth_advertisement_chromeos.h", |
| 46 "bluetooth_audio_sink.cc", | 46 "bluetooth_audio_sink.cc", |
| 47 "bluetooth_audio_sink.h", | 47 "bluetooth_audio_sink.h", |
| 48 "bluetooth_audio_sink_chromeos.cc", | 48 "bluetooth_audio_sink_chromeos.cc", |
| 49 "bluetooth_audio_sink_chromeos.h", | 49 "bluetooth_audio_sink_chromeos.h", |
| 50 "bluetooth_channel_mac.h", | 50 "bluetooth_channel_mac.h", |
| 51 "bluetooth_channel_mac.mm", | 51 "bluetooth_channel_mac.mm", |
| 52 "bluetooth_classic_device_mac.h", | |
| 53 "bluetooth_classic_device_mac.mm", | |
|
armansito
2015/06/30 20:46:41
Let's swap the order here for consistency and also
scheib
2015/06/30 20:51:43
These lists are typically alphabetically sorted, t
armansito
2015/06/30 22:20:41
Ah, OK in that case.
| |
| 52 "bluetooth_device.cc", | 54 "bluetooth_device.cc", |
| 53 "bluetooth_device.h", | 55 "bluetooth_device.h", |
| 54 "bluetooth_device_chromeos.cc", | 56 "bluetooth_device_chromeos.cc", |
| 55 "bluetooth_device_chromeos.h", | 57 "bluetooth_device_chromeos.h", |
| 56 "bluetooth_device_mac.h", | |
| 57 "bluetooth_device_mac.mm", | |
| 58 "bluetooth_device_win.cc", | 58 "bluetooth_device_win.cc", |
| 59 "bluetooth_device_win.h", | 59 "bluetooth_device_win.h", |
| 60 "bluetooth_discovery_filter.cc", | 60 "bluetooth_discovery_filter.cc", |
| 61 "bluetooth_discovery_filter.h", | 61 "bluetooth_discovery_filter.h", |
| 62 "bluetooth_discovery_manager_mac.h", | 62 "bluetooth_discovery_manager_mac.h", |
| 63 "bluetooth_discovery_manager_mac.mm", | 63 "bluetooth_discovery_manager_mac.mm", |
| 64 "bluetooth_discovery_session.cc", | 64 "bluetooth_discovery_session.cc", |
| 65 "bluetooth_discovery_session.h", | 65 "bluetooth_discovery_session.h", |
| 66 "bluetooth_gatt_characteristic.cc", | 66 "bluetooth_gatt_characteristic.cc", |
| 67 "bluetooth_gatt_characteristic.h", | 67 "bluetooth_gatt_characteristic.h", |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 248 } | 248 } |
| 249 | 249 |
| 250 if (is_android) { | 250 if (is_android) { |
| 251 generate_jni("bluetooth_jni") { | 251 generate_jni("bluetooth_jni") { |
| 252 sources = [ | 252 sources = [ |
| 253 "android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.java", | 253 "android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.java", |
| 254 ] | 254 ] |
| 255 jni_package = "bluetooth" | 255 jni_package = "bluetooth" |
| 256 } | 256 } |
| 257 } | 257 } |
| OLD | NEW |