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

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

Issue 2015463004: bluetooth: Use BluetoothUUID instead of string when sending uuids (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-mojo-request-device
Patch Set: Fix merge conflict 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 | « content/renderer/bluetooth/web_bluetooth_impl.cc ('k') | device/bluetooth/bluetooth_uuid.h » ('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 {
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 'dependencies': [ 460 'dependencies': [
461 '../../base/base.gyp:base', 461 '../../base/base.gyp:base',
462 ], 462 ],
463 'variables': { 463 'variables': {
464 'java_in_dir': '../../device/bluetooth/android/java', 464 'java_in_dir': '../../device/bluetooth/android/java',
465 }, 465 },
466 'includes': [ '../../build/java.gypi' ], 466 'includes': [ '../../build/java.gypi' ],
467 }, 467 },
468 ], 468 ],
469 }], 469 }],
470 ['OS != "ios"', {
471 'targets': [
472 {
473 'target_name': 'bluetooth_interfaces_mojom',
474 'type': 'none',
475 'variables': {
476 'mojom_files': [
477 'public/interfaces/bluetooth_uuid.mojom',
478 ],
479 'mojom_typemaps': [
480 'public/interfaces/bluetooth_uuid.typemap',
481 ],
482 },
483 'includes': [ '../../mojo/mojom_bindings_generator_explicit.gypi' ],
484 },
485 {
486 'target_name': 'bluetooth_interfaces_blink_mojom',
487 'type': 'none',
488 'variables': {
489 'mojom_files': [
490 'public/interfaces/bluetooth_uuid.mojom',
491 ],
492 'for_blink': 'true',
493 },
494 'includes': [ '../../mojo/mojom_bindings_generator_explicit.gypi' ],
495 },
496 {
497 'target_name': 'bluetooth_mojom',
498 'type': 'static_library',
499 'export_dependent_settings': [
500 '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
501 ],
502 'dependencies': [
503 '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
504 'bluetooth_interfaces_blink_mojom',
505 'bluetooth_interfaces_mojom',
506 'device_bluetooth',
507 ],
508 },
509 ],
510 }],
470 ], 511 ],
471 } 512 }
OLDNEW
« no previous file with comments | « content/renderer/bluetooth/web_bluetooth_impl.cc ('k') | device/bluetooth/bluetooth_uuid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698