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

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

Issue 2014813002: Revert of bluetooth: Remove UriBeacon code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Created 4 years, 6 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/bluetooth/BUILD.gn ('k') | device/bluetooth/uribeacon/BUILD.gn » ('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 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 {
11 # GN version: //device/bluetooth 11 # GN version: //device/bluetooth
12 'target_name': 'device_bluetooth', 12 'target_name': 'device_bluetooth',
13 'type': '<(component)', 13 'type': '<(component)',
14 'dependencies': [ 14 'dependencies': [
15 '../../base/base.gyp:base', 15 '../../base/base.gyp:base',
16 '../../crypto/crypto.gyp:crypto', 16 '../../crypto/crypto.gyp:crypto',
17 '../../net/net.gyp:net', 17 '../../net/net.gyp:net',
18 '../../ui/base/ui_base.gyp:ui_base', 18 '../../ui/base/ui_base.gyp:ui_base',
19 'bluetooth_strings.gyp:bluetooth_strings', 19 'bluetooth_strings.gyp:bluetooth_strings',
20 'uribeacon',
20 ], 21 ],
21 'defines': [ 22 'defines': [
22 'DEVICE_BLUETOOTH_IMPLEMENTATION', 23 'DEVICE_BLUETOOTH_IMPLEMENTATION',
23 ], 24 ],
24 'sources': [ 25 'sources': [
25 # Note: file list duplicated in GN build. 26 # Note: file list duplicated in GN build.
26 'android/bluetooth_jni_registrar.cc', 27 'android/bluetooth_jni_registrar.cc',
27 'android/bluetooth_jni_registrar.h', 28 'android/bluetooth_jni_registrar.h',
28 'android/wrappers.cc', 29 'android/wrappers.cc',
29 'android/wrappers.h', 30 'android/wrappers.h',
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 '-weak_framework CoreBluetooth', 381 '-weak_framework CoreBluetooth',
381 ], 382 ],
382 }, 383 },
383 }], 384 }],
384 ], 385 ],
385 }, 386 },
386 }], 387 }],
387 ], 388 ],
388 }, 389 },
389 { 390 {
391 # GN version: //device/bluetooth/uribeacon
392 'target_name': 'uribeacon',
393 'type': 'static_library',
394 'dependencies': [
395 '../../base/base.gyp:base',
396 ],
397 'sources': [
398 'uribeacon/uri_encoder.cc',
399 'uribeacon/uri_encoder.h'
400 ]
401 },
402 {
390 # GN version: //device/bluetooth:mocks 403 # GN version: //device/bluetooth:mocks
391 'target_name': 'device_bluetooth_mocks', 404 'target_name': 'device_bluetooth_mocks',
392 'type': 'static_library', 405 'type': 'static_library',
393 'dependencies': [ 406 'dependencies': [
394 '../../testing/gmock.gyp:gmock', 407 '../../testing/gmock.gyp:gmock',
395 'device_bluetooth', 408 'device_bluetooth',
396 ], 409 ],
397 'include_dirs': [ 410 'include_dirs': [
398 '../../', 411 '../../',
399 ], 412 ],
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 ], 462 ],
450 'variables': { 463 'variables': {
451 'java_in_dir': '../../device/bluetooth/android/java', 464 'java_in_dir': '../../device/bluetooth/android/java',
452 }, 465 },
453 'includes': [ '../../build/java.gypi' ], 466 'includes': [ '../../build/java.gypi' ],
454 }, 467 },
455 ], 468 ],
456 }], 469 }],
457 ], 470 ],
458 } 471 }
OLDNEW
« no previous file with comments | « device/bluetooth/BUILD.gn ('k') | device/bluetooth/uribeacon/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698