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

Side by Side Diff: device/BUILD.gn

Issue 1216583003: Adding Hashed Address to BluetoothLowEnergyDeviceMac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@timeinfo
Patch Set: shortening a signature.. Created 5 years, 5 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
« no previous file with comments | « no previous file | device/DEPS » ('j') | device/bluetooth/bluetooth_adapter_mac.h » ('J')
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 "//device/battery", 52 "//device/battery",
53 "//device/battery:mojo_bindings", 53 "//device/battery:mojo_bindings",
54 "//device/bluetooth", 54 "//device/bluetooth",
55 "//device/nfc", 55 "//device/nfc",
56 "//mojo/environment:chromium", 56 "//mojo/environment:chromium",
57 "//net", 57 "//net",
58 "//testing/gmock", 58 "//testing/gmock",
59 "//testing/gtest", 59 "//testing/gtest",
60 "//third_party/mojo/src/mojo/edk/system", 60 "//third_party/mojo/src/mojo/edk/system",
61 "//third_party/mojo/src/mojo/public/cpp/bindings", 61 "//third_party/mojo/src/mojo/public/cpp/bindings",
62 "//third_party/ocmock",
62 "//url", 63 "//url",
63 ] 64 ]
64 65
65 if (!is_linux_without_dbus && !is_chromeos) { 66 if (!is_linux_without_dbus && !is_chromeos) {
66 sources += [ "battery/battery_status_manager_linux_unittest.cc" ] 67 sources += [ "battery/battery_status_manager_linux_unittest.cc" ]
67 } 68 }
68 69
69 # HID and Serial: 70 # HID and Serial:
70 # Android doesn't compile. 71 # Android doesn't compile.
71 # Linux, requires udev. 72 # Linux, requires udev.
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 "//dbus", 133 "//dbus",
133 ] 134 ]
134 } 135 }
135 136
136 if (is_posix && !is_android && !is_mac) { 137 if (is_posix && !is_android && !is_mac) {
137 libs = [ "rt" ] 138 libs = [ "rt" ]
138 } 139 }
139 140
140 if (is_mac) { 141 if (is_mac) {
141 libs = [ "IOBluetooth.framework" ] 142 libs = [ "IOBluetooth.framework" ]
143 ldflags = [ "-ObjC" ]
142 144
143 # In the OSX 10.10 SDK, CoreBluetooth became a top level framework. 145 # In the OSX 10.10 SDK, CoreBluetooth became a top level framework.
144 # Previously, it was nested in IOBluetooth. In order for Chrome to run on 146 # Previously, it was nested in IOBluetooth. In order for Chrome to run on
145 # OSes older than OSX 10.10, the top level CoreBluetooth framework must be 147 # OSes older than OSX 10.10, the top level CoreBluetooth framework must be
146 # weakly linked. 148 # weakly linked.
147 if (mac_sdk_version == "10.10") { 149 if (mac_sdk_version == "10.10") {
148 ldflags = [ "-weak_framework CoreBluetooth" ] 150 ldflags += [ "-weak_framework CoreBluetooth" ]
149 } 151 }
150 } 152 }
151 } 153 }
152 154
153 if (is_android) { 155 if (is_android) {
154 bluetooth_java_sources_needing_jni = [ "bluetooth/test/android/java/src/org/ch romium/device/bluetooth/Fakes.java" ] 156 bluetooth_java_sources_needing_jni = [ "bluetooth/test/android/java/src/org/ch romium/device/bluetooth/Fakes.java" ]
155 157
156 generate_jni("bluetooth_test_jni_headers") { 158 generate_jni("bluetooth_test_jni_headers") {
157 sources = bluetooth_java_sources_needing_jni 159 sources = bluetooth_java_sources_needing_jni
158 jni_package = "bluetooth" 160 jni_package = "bluetooth"
159 } 161 }
160 162
161 android_library("bluetooth_test_java") { 163 android_library("bluetooth_test_java") {
162 java_files = bluetooth_java_sources_needing_jni 164 java_files = bluetooth_java_sources_needing_jni
163 deps = [ 165 deps = [
164 "//base:base_java", 166 "//base:base_java",
165 "//device/bluetooth:java", 167 "//device/bluetooth:java",
166 ] 168 ]
167 } 169 }
168 } 170 }
OLDNEW
« no previous file with comments | « no previous file | device/DEPS » ('j') | device/bluetooth/bluetooth_adapter_mac.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698