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

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: Clean up 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
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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 'test/mock_bluetooth_gatt_descriptor.cc', 427 'test/mock_bluetooth_gatt_descriptor.cc',
428 'test/mock_bluetooth_gatt_descriptor.h', 428 'test/mock_bluetooth_gatt_descriptor.h',
429 'test/mock_bluetooth_gatt_notify_session.cc', 429 'test/mock_bluetooth_gatt_notify_session.cc',
430 'test/mock_bluetooth_gatt_notify_session.h', 430 'test/mock_bluetooth_gatt_notify_session.h',
431 'test/mock_bluetooth_gatt_service.cc', 431 'test/mock_bluetooth_gatt_service.cc',
432 'test/mock_bluetooth_gatt_service.h', 432 'test/mock_bluetooth_gatt_service.h',
433 'test/mock_bluetooth_socket.cc', 433 'test/mock_bluetooth_socket.cc',
434 'test/mock_bluetooth_socket.h', 434 'test/mock_bluetooth_socket.h',
435 ], 435 ],
436 }, 436 },
437 {
438 'target_name': 'bluetooth_interfaces_mojom',
439 'type': 'none',
440 'variables': {
441 'mojom_files': [
442 'public/interfaces/bluetooth_uuid.mojom',
443 ],
444 'mojom_typemaps': [
445 'public/interfaces/bluetooth_uuid.typemap',
446 ],
447 },
448 'includes': [ '../../mojo/mojom_bindings_generator_explicit.gypi' ],
449 },
450 {
451 'target_name': 'bluetooth_interfaces_blink_mojom',
452 'type': 'none',
453 'variables': {
454 'mojom_files': [
455 'public/interfaces/bluetooth_uuid.mojom',
456 ],
457 'for_blink': 'true',
458 },
459 'includes': [ '../../mojo/mojom_bindings_generator_explicit.gypi' ],
460 },
461 {
462 'target_name': 'bluetooth_mojom',
463 'type': 'static_library',
464 'export_dependent_settings': [
465 '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
466 ],
467 'dependencies': [
468 '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
469 'bluetooth_interfaces_blink_mojom',
470 'bluetooth_interfaces_mojom',
471 'device_bluetooth',
472 ],
473 },
437 ], 474 ],
438 'conditions': [ 475 'conditions': [
439 ['OS == "android"', { 476 ['OS == "android"', {
440 'targets': [ 477 'targets': [
441 { 478 {
442 'target_name': 'device_bluetooth_jni_headers', 479 'target_name': 'device_bluetooth_jni_headers',
443 'type': 'none', 480 'type': 'none',
444 'sources': [ 481 'sources': [
445 'android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapt er.java', 482 'android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapt er.java',
446 'android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevic e.java', 483 'android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevic e.java',
(...skipping 15 matching lines...) Expand all
462 ], 499 ],
463 'variables': { 500 'variables': {
464 'java_in_dir': '../../device/bluetooth/android/java', 501 'java_in_dir': '../../device/bluetooth/android/java',
465 }, 502 },
466 'includes': [ '../../build/java.gypi' ], 503 'includes': [ '../../build/java.gypi' ],
467 }, 504 },
468 ], 505 ],
469 }], 506 }],
470 ], 507 ],
471 } 508 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698