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

Side by Side Diff: device/bluetooth/bluetooth.gyp

Issue 1065453003: Revert of mac: Weakly link against the CoreBluetooth framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | « device/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 'setupapi.dll', 145 'setupapi.dll',
146 ], 146 ],
147 }, 147 },
148 }, 148 },
149 }], 149 }],
150 ['OS=="mac"', { 150 ['OS=="mac"', {
151 'link_settings': { 151 'link_settings': {
152 'libraries': [ 152 'libraries': [
153 '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework', 153 '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework',
154 ], 154 ],
155 'conditions': [
156 ['mac_sdk == "10.10"', {
157 'xcode_settings': {
158 # In the OSX 10.10 SDK, CoreBluetooth became a top level
159 # framework. Previously, it was nested in IOBluetooth. In
160 # order for Chrome to run on OSes older than OSX 10.10, the
161 # top level CoreBluetooth framework must be weakly linked.
162 'OTHER_LDFLAGS': [
163 '-weak_framework CoreBluetooth',
164 ],
165 },
166 }],
167 ],
168 }, 155 },
169 }], 156 }],
170 ], 157 ],
171 }, 158 },
172 { 159 {
173 'target_name': 'uribeacon', 160 'target_name': 'uribeacon',
174 'type': 'static_library', 161 'type': 'static_library',
175 'dependencies': [ 162 'dependencies': [
176 '../../base/base.gyp:base', 163 '../../base/base.gyp:base',
177 ], 164 ],
(...skipping 30 matching lines...) Expand all
208 'test/mock_bluetooth_gatt_notify_session.cc', 195 'test/mock_bluetooth_gatt_notify_session.cc',
209 'test/mock_bluetooth_gatt_notify_session.h', 196 'test/mock_bluetooth_gatt_notify_session.h',
210 'test/mock_bluetooth_gatt_service.cc', 197 'test/mock_bluetooth_gatt_service.cc',
211 'test/mock_bluetooth_gatt_service.h', 198 'test/mock_bluetooth_gatt_service.h',
212 'test/mock_bluetooth_socket.cc', 199 'test/mock_bluetooth_socket.cc',
213 'test/mock_bluetooth_socket.h', 200 'test/mock_bluetooth_socket.h',
214 ], 201 ],
215 }, 202 },
216 ], 203 ],
217 } 204 }
OLDNEW
« no previous file with comments | « device/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698