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

Side by Side Diff: device/BUILD.gn

Issue 1317933003: bluetooth-advertising: Fix wrong assignment and append of wrong type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-origin
Patch Set: Address armansito's comments Created 5 years, 3 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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/rules.gni") # For generate_jni(). 9 import("//build/config/android/rules.gni") # For generate_jni().
10 } 10 }
(...skipping 16 matching lines...) Expand all
27 27
28 test("device_unittests") { 28 test("device_unittests") {
29 sources = [ 29 sources = [
30 "battery/battery_status_manager_win_unittest.cc", 30 "battery/battery_status_manager_win_unittest.cc",
31 "battery/battery_status_service_unittest.cc", 31 "battery/battery_status_service_unittest.cc",
32 "bluetooth/bluetooth_adapter_mac_unittest.mm", 32 "bluetooth/bluetooth_adapter_mac_unittest.mm",
33 "bluetooth/bluetooth_adapter_profile_chromeos_unittest.cc", 33 "bluetooth/bluetooth_adapter_profile_chromeos_unittest.cc",
34 "bluetooth/bluetooth_adapter_unittest.cc", 34 "bluetooth/bluetooth_adapter_unittest.cc",
35 "bluetooth/bluetooth_adapter_win_unittest.cc", 35 "bluetooth/bluetooth_adapter_win_unittest.cc",
36 "bluetooth/bluetooth_advertisement_chromeos_unittest.cc", 36 "bluetooth/bluetooth_advertisement_chromeos_unittest.cc",
37 "bluetooth/bluetooth_advertisement_unittest.cc",
37 "bluetooth/bluetooth_audio_sink_chromeos_unittest.cc", 38 "bluetooth/bluetooth_audio_sink_chromeos_unittest.cc",
38 "bluetooth/bluetooth_chromeos_unittest.cc", 39 "bluetooth/bluetooth_chromeos_unittest.cc",
39 "bluetooth/bluetooth_device_unittest.cc", 40 "bluetooth/bluetooth_device_unittest.cc",
40 "bluetooth/bluetooth_device_win_unittest.cc", 41 "bluetooth/bluetooth_device_win_unittest.cc",
41 "bluetooth/bluetooth_discovery_filter_unittest.cc", 42 "bluetooth/bluetooth_discovery_filter_unittest.cc",
42 "bluetooth/bluetooth_gatt_chromeos_unittest.cc", 43 "bluetooth/bluetooth_gatt_chromeos_unittest.cc",
43 "bluetooth/bluetooth_low_energy_win_unittest.cc", 44 "bluetooth/bluetooth_low_energy_win_unittest.cc",
44 "bluetooth/bluetooth_service_record_win_unittest.cc", 45 "bluetooth/bluetooth_service_record_win_unittest.cc",
45 "bluetooth/bluetooth_socket_chromeos_unittest.cc", 46 "bluetooth/bluetooth_socket_chromeos_unittest.cc",
46 "bluetooth/bluetooth_task_manager_win_unittest.cc", 47 "bluetooth/bluetooth_task_manager_win_unittest.cc",
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 } 176 }
176 177
177 android_library("bluetooth_test_java") { 178 android_library("bluetooth_test_java") {
178 java_files = bluetooth_java_sources_needing_jni 179 java_files = bluetooth_java_sources_needing_jni
179 deps = [ 180 deps = [
180 "//base:base_java", 181 "//base:base_java",
181 "//device/bluetooth:java", 182 "//device/bluetooth:java",
182 ] 183 ]
183 } 184 }
184 } 185 }
OLDNEW
« no previous file with comments | « chromeos/dbus/bluetooth_le_advertisement_service_provider.cc ('k') | device/bluetooth/bluetooth_advertisement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698