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

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

Powered by Google App Engine
This is Rietveld 408576698