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

Side by Side Diff: device/BUILD.gn

Issue 1412963004: bluetooth: android: Implement Characteristic GetIdentifier, fix Service IDs too. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « no previous file | device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 22 matching lines...) Expand all
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_advertisement_unittest.cc",
38 "bluetooth/bluetooth_audio_sink_chromeos_unittest.cc", 38 "bluetooth/bluetooth_audio_sink_chromeos_unittest.cc",
39 "bluetooth/bluetooth_chromeos_unittest.cc", 39 "bluetooth/bluetooth_chromeos_unittest.cc",
40 "bluetooth/bluetooth_device_unittest.cc", 40 "bluetooth/bluetooth_device_unittest.cc",
41 "bluetooth/bluetooth_device_win_unittest.cc", 41 "bluetooth/bluetooth_device_win_unittest.cc",
42 "bluetooth/bluetooth_discovery_filter_unittest.cc", 42 "bluetooth/bluetooth_discovery_filter_unittest.cc",
43 "bluetooth/bluetooth_gatt_characteristic_unittest.cc",
43 "bluetooth/bluetooth_gatt_chromeos_unittest.cc", 44 "bluetooth/bluetooth_gatt_chromeos_unittest.cc",
44 "bluetooth/bluetooth_gatt_service_unittest.cc", 45 "bluetooth/bluetooth_gatt_service_unittest.cc",
45 "bluetooth/bluetooth_low_energy_win_unittest.cc", 46 "bluetooth/bluetooth_low_energy_win_unittest.cc",
46 "bluetooth/bluetooth_service_record_win_unittest.cc", 47 "bluetooth/bluetooth_service_record_win_unittest.cc",
47 "bluetooth/bluetooth_socket_chromeos_unittest.cc", 48 "bluetooth/bluetooth_socket_chromeos_unittest.cc",
48 "bluetooth/bluetooth_task_manager_win_unittest.cc", 49 "bluetooth/bluetooth_task_manager_win_unittest.cc",
49 "bluetooth/bluetooth_uuid_unittest.cc", 50 "bluetooth/bluetooth_uuid_unittest.cc",
50 "bluetooth/test/bluetooth_test.cc", 51 "bluetooth/test/bluetooth_test.cc",
51 "bluetooth/test/bluetooth_test.h", 52 "bluetooth/test/bluetooth_test.h",
52 "bluetooth/test/bluetooth_test_android.cc", 53 "bluetooth/test/bluetooth_test_android.cc",
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 if (is_mac) { 163 if (is_mac) {
163 deps += [ "//third_party/ocmock" ] 164 deps += [ "//third_party/ocmock" ]
164 ldflags = [ "-ObjC" ] 165 ldflags = [ "-ObjC" ]
165 libs = [ "IOBluetooth.framework" ] 166 libs = [ "IOBluetooth.framework" ]
166 167
167 # In the OSX 10.10 SDK, CoreBluetooth became a top level framework. 168 # In the OSX 10.10 SDK, CoreBluetooth became a top level framework.
168 # Previously, it was nested in IOBluetooth. In order for Chrome to run on 169 # Previously, it was nested in IOBluetooth. In order for Chrome to run on
169 # OSes older than OSX 10.10, the top level CoreBluetooth framework must be 170 # OSes older than OSX 10.10, the top level CoreBluetooth framework must be
170 # weakly linked. 171 # weakly linked.
171 if (mac_sdk_version == "10.10") { 172 if (mac_sdk_version == "10.10") {
172 ldflags += [ "-weak_framework", "CoreBluetooth" ] 173 ldflags += [
174 "-weak_framework",
175 "CoreBluetooth",
176 ]
173 } 177 }
174 } 178 }
175 } 179 }
176 180
177 if (is_android) { 181 if (is_android) {
178 bluetooth_java_sources_needing_jni = [ "bluetooth/test/android/java/src/org/ch romium/device/bluetooth/Fakes.java" ] 182 bluetooth_java_sources_needing_jni = [ "bluetooth/test/android/java/src/org/ch romium/device/bluetooth/Fakes.java" ]
179 183
180 generate_jni("bluetooth_test_jni_headers") { 184 generate_jni("bluetooth_test_jni_headers") {
181 sources = bluetooth_java_sources_needing_jni 185 sources = bluetooth_java_sources_needing_jni
182 jni_package = "bluetooth" 186 jni_package = "bluetooth"
183 } 187 }
184 188
185 android_library("bluetooth_test_java") { 189 android_library("bluetooth_test_java") {
186 java_files = bluetooth_java_sources_needing_jni 190 java_files = bluetooth_java_sources_needing_jni
187 deps = [ 191 deps = [
188 "//base:base_java", 192 "//base:base_java",
189 "//device/bluetooth:java", 193 "//device/bluetooth:java",
190 ] 194 ]
191 } 195 }
192 } 196 }
OLDNEW
« no previous file with comments | « no previous file | device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698