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

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: Fix build 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 { 131 {
132 # GN version: //third_party/WebKit/public:mojo_bindings 132 # GN version: //third_party/WebKit/public:mojo_bindings
133 'target_name': 'mojo_bindings_mojom', 133 'target_name': 'mojo_bindings_mojom',
134 'type': 'none', 134 'type': 'none',
135 'variables': { 135 'variables': {
136 'mojom_files': [ 136 'mojom_files': [
137 '<@(blink_mojo_sources)', 137 '<@(blink_mojo_sources)',
138 '<@(blink_android_mojo_sources)', 138 '<@(blink_android_mojo_sources)',
139 ], 139 ],
140 'mojom_typemaps': [ 140 'mojom_typemaps': [
141 '../../../components/web_bluetooth/public/interfaces/web_bluet ooth_device_id.typemap',
141 '../../../device/bluetooth/public/interfaces/bluetooth_uuid.ty pemap', 142 '../../../device/bluetooth/public/interfaces/bluetooth_uuid.ty pemap',
142 '<(DEPTH)/cc/ipc/surface_id.typemap', 143 '<(DEPTH)/cc/ipc/surface_id.typemap',
143 '<(DEPTH)/cc/ipc/surface_sequence.typemap', 144 '<(DEPTH)/cc/ipc/surface_sequence.typemap',
144 ], 145 ],
145 }, 146 },
146 'dependencies' : [ 147 'dependencies' : [
147 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces', 148 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces',
148 ], 149 ],
149 'includes': [ 150 'includes': [
150 '../../../mojo/mojom_bindings_generator_explicit.gypi', 151 '../../../mojo/mojom_bindings_generator_explicit.gypi',
151 ], 152 ],
152 }, 153 },
153 { 154 {
154 # GN version: //third_party/WebKit/public:mojo_bindings 155 # GN version: //third_party/WebKit/public:mojo_bindings
155 'target_name': 'mojo_bindings', 156 'target_name': 'mojo_bindings',
156 # Needed because of dependency on generated headers. 157 # Needed because of dependency on generated headers.
157 'hard_dependency': '1', 158 'hard_dependency': '1',
158 'type': 'static_library', 159 'type': 'static_library',
159 'dependencies': [ 160 'dependencies': [
160 'mojo_bindings_blink_mojom', 161 'mojo_bindings_blink_mojom',
161 'mojo_bindings_mojom', 162 'mojo_bindings_mojom',
163 '../../../components/web_bluetooth/web_bluetooth.gyp:web_bluetoo th_mojom',
164 '../../../device/bluetooth/bluetooth.gyp:bluetooth_mojom',
162 '../../../mojo/mojo_public.gyp:mojo_cpp_bindings', 165 '../../../mojo/mojo_public.gyp:mojo_cpp_bindings',
163 '../../../device/bluetooth/bluetooth.gyp:bluetooth_mojom',
164 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces', 166 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces',
165 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink', 167 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink',
166 ], 168 ],
167 }, 169 },
168 ], 170 ],
169 'conditions': [ 171 'conditions': [
170 ['OS == "android"', { 172 ['OS == "android"', {
171 'targets': [ 173 'targets': [
172 { 174 {
173 'target_name': 'android_mojo_bindings_mojom', 175 'target_name': 'android_mojo_bindings_mojom',
(...skipping 11 matching lines...) Expand all
185 'type': 'static_library', 187 'type': 'static_library',
186 'dependencies': [ 188 'dependencies': [
187 'android_mojo_bindings_mojom', 189 'android_mojo_bindings_mojom',
188 '../../../mojo/mojo_public.gyp:mojo_bindings_java', 190 '../../../mojo/mojo_public.gyp:mojo_bindings_java',
189 ], 191 ],
190 }, 192 },
191 ], 193 ],
192 }], 194 }],
193 ], 195 ],
194 } 196 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698