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

Side by Side Diff: third_party/WebKit/public/blink.gyp

Issue 2019853002: bluetooth: Use WebBluetoothDeviceId instead of string (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-uuid-typemap
Patch Set: Rebase on top of another patch Created 4 years, 5 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 # 1 #
2 # Copyright (C) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 18 matching lines...) Expand all
29 # 29 #
30 { 30 {
31 'includes': [ 31 'includes': [
32 '../Source/build/features.gypi', 32 '../Source/build/features.gypi',
33 ], 33 ],
34 'variables': { 34 'variables': {
35 # Duplicated in GN: //third_party/WebKit/public:mojo_bindings 35 # Duplicated in GN: //third_party/WebKit/public:mojo_bindings
36 'blink_mojo_sources': [ 36 'blink_mojo_sources': [
37 'platform/mime_registry.mojom', 37 'platform/mime_registry.mojom',
38 'platform/modules/background_sync/background_sync.mojom', 38 'platform/modules/background_sync/background_sync.mojom',
39 'platform/modules/bluetooth/web_bluetooth.mojom',
40 'platform/modules/geolocation/geolocation.mojom', 39 'platform/modules/geolocation/geolocation.mojom',
41 'platform/modules/notifications/notification.mojom', 40 'platform/modules/notifications/notification.mojom',
42 'platform/modules/notifications/notification_service.mojom', 41 'platform/modules/notifications/notification_service.mojom',
43 'platform/modules/offscreencanvas/offscreen_canvas_surface.mojom', 42 'platform/modules/offscreencanvas/offscreen_canvas_surface.mojom',
44 'platform/modules/permissions/permission.mojom', 43 'platform/modules/permissions/permission.mojom',
45 'platform/modules/permissions/permission_status.mojom', 44 'platform/modules/permissions/permission_status.mojom',
46 'platform/modules/presentation/presentation.mojom', 45 'platform/modules/presentation/presentation.mojom',
47 'platform/modules/serviceworker/service_worker_event_status.mojom', 46 'platform/modules/serviceworker/service_worker_event_status.mojom',
48 'platform/modules/wake_lock/wake_lock_service.mojom', 47 'platform/modules/wake_lock/wake_lock_service.mojom',
49 'platform/modules/webshare/webshare.mojom', 48 'platform/modules/webshare/webshare.mojom',
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 }, 106 },
108 { 107 {
109 # GN version: //third_party/WebKit/public:mojo_bindings_blink 108 # GN version: //third_party/WebKit/public:mojo_bindings_blink
110 # (generated by //third_party/WebKit/public:mojo_bindings) 109 # (generated by //third_party/WebKit/public:mojo_bindings)
111 'target_name': 'mojo_bindings_blink_mojom', 110 'target_name': 'mojo_bindings_blink_mojom',
112 'type': 'none', 111 'type': 'none',
113 'variables': { 112 'variables': {
114 'mojom_files': [ 113 'mojom_files': [
115 '<@(blink_mojo_sources)', 114 '<@(blink_mojo_sources)',
116 '<@(blink_android_mojo_sources)', 115 '<@(blink_android_mojo_sources)',
116 'platform/modules/bluetooth/web_bluetooth.mojom',
jbroman 2016/07/14 15:14:24 Why is this being taken out of the Chromium varian
ortuno 2016/07/15 00:05:12 blink.gyp generates both chromium and blink varian
jbroman 2016/07/15 17:10:33 Have you brought this up on chromium-mojo@? I'd ra
ortuno 2016/07/15 18:23:16 I did not, mainly because whatever we decide to do
117 ], 117 ],
118 'mojom_typemaps': [ 118 'mojom_typemaps': [
119 '<(DEPTH)/cc/ipc/surface_id.typemap', 119 '<(DEPTH)/cc/ipc/surface_id.typemap',
120 '<(DEPTH)/cc/ipc/surface_sequence.typemap', 120 '<(DEPTH)/cc/ipc/surface_sequence.typemap',
121 121
122 ], 122 ],
123 'for_blink': 'true', 123 'for_blink': 'true',
124 }, 124 },
125 'dependencies' : [ 125 'dependencies' : [
126 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink', 126 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink',
127 ], 127 ],
128 'includes': [ 128 'includes': [
129 '../../../mojo/mojom_bindings_generator_explicit.gypi', 129 '../../../mojo/mojom_bindings_generator_explicit.gypi',
130 ], 130 ],
131 }, 131 },
132 { 132 {
133 # GN version: //third_party/WebKit/public:mojo_bindings 133 # GN version: //third_party/WebKit/public:mojo_bindings
134 'target_name': 'mojo_bindings_mojom', 134 'target_name': 'mojo_bindings_mojom',
135 'type': 'none', 135 'type': 'none',
136 'variables': { 136 'variables': {
137 'mojom_files': [ 137 'mojom_files': [
138 '<@(blink_mojo_sources)', 138 '<@(blink_mojo_sources)',
139 '<@(blink_android_mojo_sources)', 139 '<@(blink_android_mojo_sources)',
140 ], 140 ],
141 'mojom_typemaps': [ 141 'mojom_typemaps': [
142 '../../../device/bluetooth/public/interfaces/bluetooth_uuid.ty pemap',
143 '<(DEPTH)/cc/ipc/surface_id.typemap', 142 '<(DEPTH)/cc/ipc/surface_id.typemap',
144 '<(DEPTH)/cc/ipc/surface_sequence.typemap', 143 '<(DEPTH)/cc/ipc/surface_sequence.typemap',
145 ], 144 ],
146 }, 145 },
147 'dependencies' : [ 146 'dependencies' : [
148 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces', 147 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces',
149 ], 148 ],
150 'includes': [ 149 'includes': [
151 '../../../mojo/mojom_bindings_generator_explicit.gypi', 150 '../../../mojo/mojom_bindings_generator_explicit.gypi',
152 ], 151 ],
153 }, 152 },
154 { 153 {
155 # GN version: //third_party/WebKit/public:mojo_bindings 154 # GN version: //third_party/WebKit/public:mojo_bindings
156 'target_name': 'mojo_bindings', 155 'target_name': 'mojo_bindings',
157 # Needed because of dependency on generated headers. 156 # Needed because of dependency on generated headers.
158 'hard_dependency': '1', 157 'hard_dependency': '1',
159 'type': 'static_library', 158 'type': 'static_library',
160 'dependencies': [ 159 'dependencies': [
161 'mojo_bindings_blink_mojom', 160 'mojo_bindings_blink_mojom',
162 'mojo_bindings_mojom', 161 'mojo_bindings_mojom',
163 '../../../mojo/mojo_public.gyp:mojo_cpp_bindings', 162 '../../../mojo/mojo_public.gyp:mojo_cpp_bindings',
164 '../../../device/bluetooth/bluetooth.gyp:bluetooth_mojom',
jbroman 2016/07/14 15:14:24 Why are these no longer needed? device.mojom.Bluet
ortuno 2016/07/15 00:05:12 Ah right. I accidentally moved this to content.
165 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces', 163 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces',
166 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink', 164 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink',
167 ], 165 ],
168 }, 166 },
169 ], 167 ],
170 'conditions': [ 168 'conditions': [
171 ['OS == "android"', { 169 ['OS == "android"', {
172 'targets': [ 170 'targets': [
173 { 171 {
174 'target_name': 'android_mojo_bindings_mojom', 172 'target_name': 'android_mojo_bindings_mojom',
(...skipping 11 matching lines...) Expand all
186 'type': 'static_library', 184 'type': 'static_library',
187 'dependencies': [ 185 'dependencies': [
188 'android_mojo_bindings_mojom', 186 'android_mojo_bindings_mojom',
189 '../../../mojo/mojo_public.gyp:mojo_bindings_java', 187 '../../../mojo/mojo_public.gyp:mojo_bindings_java',
190 ], 188 ],
191 }, 189 },
192 ], 190 ],
193 }], 191 }],
194 ], 192 ],
195 } 193 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698