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

Side by Side Diff: third_party/WebKit/public/blink.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
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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 }, 121 },
122 { 122 {
123 # GN version: //third_party/WebKit/public:mojo_bindings 123 # GN version: //third_party/WebKit/public:mojo_bindings
124 'target_name': 'mojo_bindings_mojom', 124 'target_name': 'mojo_bindings_mojom',
125 'type': 'none', 125 'type': 'none',
126 'variables': { 126 'variables': {
127 'mojom_files': [ 127 'mojom_files': [
128 '<@(blink_mojo_sources)', 128 '<@(blink_mojo_sources)',
129 '<@(blink_android_mojo_sources)', 129 '<@(blink_android_mojo_sources)',
130 ], 130 ],
131 'mojom_typemaps': [
132 '../../../device/bluetooth/public/interfaces/bluetooth_uuid.ty pemap',
133 ],
131 }, 134 },
132 'includes': [ 135 'includes': [
133 '../../../mojo/mojom_bindings_generator_explicit.gypi', 136 '../../../mojo/mojom_bindings_generator_explicit.gypi',
134 ], 137 ],
135 }, 138 },
136 { 139 {
137 # GN version: //third_party/WebKit/public:mojo_bindings 140 # GN version: //third_party/WebKit/public:mojo_bindings
138 'target_name': 'mojo_bindings', 141 'target_name': 'mojo_bindings',
139 'type': 'static_library', 142 'type': 'static_library',
140 'dependencies': [ 143 'dependencies': [
141 'mojo_bindings_blink_mojom', 144 'mojo_bindings_blink_mojom',
142 'mojo_bindings_mojom', 145 'mojo_bindings_mojom',
143 '../../../mojo/mojo_public.gyp:mojo_cpp_bindings', 146 '../../../mojo/mojo_public.gyp:mojo_cpp_bindings',
147 '../../../device/bluetooth/bluetooth.gyp:bluetooth_mojom',
144 ], 148 ],
145 }, 149 },
146 ], 150 ],
147 'conditions': [ 151 'conditions': [
148 ['OS == "android"', { 152 ['OS == "android"', {
149 'targets': [ 153 'targets': [
150 { 154 {
151 'target_name': 'android_mojo_bindings_mojom', 155 'target_name': 'android_mojo_bindings_mojom',
152 'type': 'none', 156 'type': 'none',
153 'variables': { 157 'variables': {
154 'mojom_files': ['<@(blink_android_mojo_sources)'], 158 'mojom_files': ['<@(blink_android_mojo_sources)'],
155 }, 159 },
156 'includes': [ 160 'includes': [
157 '../../../mojo/mojom_bindings_generator_explicit.gypi', 161 '../../../mojo/mojom_bindings_generator_explicit.gypi',
158 ], 162 ],
159 }, 163 },
160 { 164 {
161 # GN version: //third_party/WebKit/public:android_mojo_bindi ngs_java 165 # GN version: //third_party/WebKit/public:android_mojo_bindi ngs_java
162 'target_name': 'android_mojo_bindings_java', 166 'target_name': 'android_mojo_bindings_java',
163 'type': 'static_library', 167 'type': 'static_library',
164 'dependencies': [ 168 'dependencies': [
165 'android_mojo_bindings_mojom', 169 'android_mojo_bindings_mojom',
166 '../../../mojo/mojo_public.gyp:mojo_bindings_java', 170 '../../../mojo/mojo_public.gyp:mojo_bindings_java',
167 ], 171 ],
168 }, 172 },
169 ], 173 ],
170 }], 174 }],
171 ], 175 ],
172 } 176 }
OLDNEW
« no previous file with comments | « third_party/WebKit/public/BUILD.gn ('k') | third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698