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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth.gyp
diff --git a/device/bluetooth/bluetooth.gyp b/device/bluetooth/bluetooth.gyp
index 002ef8d5db93e3a216391aefe09c733045e5371f..03df98173d68a054be54e7ebafeac1114f22c9de 100644
--- a/device/bluetooth/bluetooth.gyp
+++ b/device/bluetooth/bluetooth.gyp
@@ -467,5 +467,46 @@
},
],
}],
+ ['OS != "ios"', {
+ 'targets': [
+ {
+ 'target_name': 'bluetooth_interfaces_mojom',
+ 'type': 'none',
+ 'variables': {
+ 'mojom_files': [
+ 'public/interfaces/bluetooth_uuid.mojom',
+ ],
+ 'mojom_typemaps': [
+ 'public/interfaces/bluetooth_uuid.typemap',
+ ],
+ },
+ 'includes': [ '../../mojo/mojom_bindings_generator_explicit.gypi' ],
+ },
+ {
+ 'target_name': 'bluetooth_interfaces_blink_mojom',
+ 'type': 'none',
+ 'variables': {
+ 'mojom_files': [
+ 'public/interfaces/bluetooth_uuid.mojom',
+ ],
+ 'for_blink': 'true',
+ },
+ 'includes': [ '../../mojo/mojom_bindings_generator_explicit.gypi' ],
+ },
+ {
+ 'target_name': 'bluetooth_mojom',
+ 'type': 'static_library',
+ 'export_dependent_settings': [
+ '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+ ],
+ 'dependencies': [
+ '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+ 'bluetooth_interfaces_blink_mojom',
+ 'bluetooth_interfaces_mojom',
+ 'device_bluetooth',
+ ],
+ },
+ ],
+ }],
],
}
« 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