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

Side by Side Diff: mojo/public/mojo_public.gyp

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + ios gyp fixes Created 6 years, 1 month 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
« no previous file with comments | « mojo/public/mojo_application.gni ('k') | mojo/public/python/mojo/bindings/descriptor.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'includes': [ 6 'includes': [
7 '../mojo_variables.gypi', 7 '../mojo_variables.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 }, 63 },
64 { 64 {
65 # GN version: //mojo/public/cpp/bindings 65 # GN version: //mojo/public/cpp/bindings
66 'target_name': 'mojo_cpp_bindings', 66 'target_name': 'mojo_cpp_bindings',
67 'type': 'static_library', 67 'type': 'static_library',
68 'include_dirs': [ 68 'include_dirs': [
69 '../..' 69 '../..'
70 ], 70 ],
71 'sources': [ 71 'sources': [
72 'cpp/bindings/array.h', 72 'cpp/bindings/array.h',
73 'cpp/bindings/binding.h',
73 'cpp/bindings/callback.h', 74 'cpp/bindings/callback.h',
74 'cpp/bindings/error_handler.h', 75 'cpp/bindings/error_handler.h',
75 'cpp/bindings/interface_impl.h', 76 'cpp/bindings/interface_impl.h',
76 'cpp/bindings/interface_ptr.h', 77 'cpp/bindings/interface_ptr.h',
77 'cpp/bindings/interface_request.h', 78 'cpp/bindings/interface_request.h',
78 'cpp/bindings/message.h', 79 'cpp/bindings/message.h',
79 'cpp/bindings/message_filter.h', 80 'cpp/bindings/message_filter.h',
80 'cpp/bindings/no_interface.h', 81 'cpp/bindings/no_interface.h',
81 'cpp/bindings/string.h', 82 'cpp/bindings/string.h',
83 'cpp/bindings/strong_binding.h',
82 'cpp/bindings/type_converter.h', 84 'cpp/bindings/type_converter.h',
83 'cpp/bindings/lib/array_internal.h', 85 'cpp/bindings/lib/array_internal.h',
84 'cpp/bindings/lib/array_internal.cc', 86 'cpp/bindings/lib/array_internal.cc',
85 'cpp/bindings/lib/array_serialization.h', 87 'cpp/bindings/lib/array_serialization.h',
86 'cpp/bindings/lib/bindings_internal.h', 88 'cpp/bindings/lib/bindings_internal.h',
87 'cpp/bindings/lib/bindings_serialization.cc', 89 'cpp/bindings/lib/bindings_serialization.cc',
88 'cpp/bindings/lib/bindings_serialization.h', 90 'cpp/bindings/lib/bindings_serialization.h',
89 'cpp/bindings/lib/bounds_checker.cc', 91 'cpp/bindings/lib/bounds_checker.cc',
90 'cpp/bindings/lib/bounds_checker.h', 92 'cpp/bindings/lib/bounds_checker.h',
91 'cpp/bindings/lib/buffer.h', 93 'cpp/bindings/lib/buffer.h',
92 'cpp/bindings/lib/callback_internal.h', 94 'cpp/bindings/lib/callback_internal.h',
93 'cpp/bindings/lib/connector.cc', 95 'cpp/bindings/lib/connector.cc',
94 'cpp/bindings/lib/connector.h', 96 'cpp/bindings/lib/connector.h',
95 'cpp/bindings/lib/filter_chain.cc', 97 'cpp/bindings/lib/filter_chain.cc',
96 'cpp/bindings/lib/filter_chain.h', 98 'cpp/bindings/lib/filter_chain.h',
97 'cpp/bindings/lib/fixed_buffer.cc', 99 'cpp/bindings/lib/fixed_buffer.cc',
98 'cpp/bindings/lib/fixed_buffer.h', 100 'cpp/bindings/lib/fixed_buffer.h',
99 'cpp/bindings/lib/interface_impl_internal.h',
100 'cpp/bindings/lib/interface_ptr_internal.h', 101 'cpp/bindings/lib/interface_ptr_internal.h',
101 'cpp/bindings/lib/map_data_internal.h', 102 'cpp/bindings/lib/map_data_internal.h',
102 'cpp/bindings/lib/map_internal.h', 103 'cpp/bindings/lib/map_internal.h',
103 'cpp/bindings/lib/map_serialization.h', 104 'cpp/bindings/lib/map_serialization.h',
104 'cpp/bindings/lib/message.cc', 105 'cpp/bindings/lib/message.cc',
105 'cpp/bindings/lib/message_builder.cc', 106 'cpp/bindings/lib/message_builder.cc',
106 'cpp/bindings/lib/message_builder.h', 107 'cpp/bindings/lib/message_builder.h',
107 'cpp/bindings/lib/message_filter.cc', 108 'cpp/bindings/lib/message_filter.cc',
108 'cpp/bindings/lib/message_header_validator.cc', 109 'cpp/bindings/lib/message_header_validator.cc',
109 'cpp/bindings/lib/message_header_validator.h', 110 'cpp/bindings/lib/message_header_validator.h',
110 'cpp/bindings/lib/message_internal.h', 111 'cpp/bindings/lib/message_internal.h',
111 'cpp/bindings/lib/message_queue.cc', 112 'cpp/bindings/lib/message_queue.cc',
112 'cpp/bindings/lib/message_queue.h', 113 'cpp/bindings/lib/message_queue.h',
113 'cpp/bindings/lib/no_interface.cc', 114 'cpp/bindings/lib/no_interface.cc',
114 'cpp/bindings/lib/router.cc', 115 'cpp/bindings/lib/router.cc',
115 'cpp/bindings/lib/router.h', 116 'cpp/bindings/lib/router.h',
116 'cpp/bindings/lib/shared_data.h', 117 'cpp/bindings/lib/shared_data.h',
117 'cpp/bindings/lib/shared_ptr.h', 118 'cpp/bindings/lib/shared_ptr.h',
118 'cpp/bindings/lib/string_serialization.h', 119 'cpp/bindings/lib/string_serialization.h',
119 'cpp/bindings/lib/string_serialization.cc', 120 'cpp/bindings/lib/string_serialization.cc',
120 'cpp/bindings/lib/validate_params.h', 121 'cpp/bindings/lib/validate_params.h',
121 'cpp/bindings/lib/validation_errors.cc', 122 'cpp/bindings/lib/validation_errors.cc',
122 'cpp/bindings/lib/validation_errors.h', 123 'cpp/bindings/lib/validation_errors.h',
123 ], 124 ],
124 }, 125 },
125 { 126 {
126 # GN version: //mojo/public/js/bindings 127 # GN version: //mojo/public/js
127 'target_name': 'mojo_js_bindings', 128 'target_name': 'mojo_js_bindings',
128 'type': 'static_library', 129 'type': 'static_library',
129 'include_dirs': [ 130 'include_dirs': [
130 '../..' 131 '../..'
131 ], 132 ],
132 'sources': [ 133 'sources': [
133 'js/constants.cc', 134 'js/constants.cc',
134 'js/constants.h', 135 'js/constants.h',
135 ], 136 ],
136 }, 137 },
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 'cpp/utility/lib/mutex.cc', 182 'cpp/utility/lib/mutex.cc',
182 'cpp/utility/lib/thread.cc', 183 'cpp/utility/lib/thread.cc',
183 ], 184 ],
184 }], 185 }],
185 ], 186 ],
186 'include_dirs': [ 187 'include_dirs': [
187 '../..', 188 '../..',
188 ], 189 ],
189 }, 190 },
190 { 191 {
192 'target_name': 'mojo_application_bindings_mojom',
193 'type': 'none',
194 'variables': {
195 'mojom_files': [
196 'interfaces/application/application.mojom',
197 'interfaces/application/service_provider.mojom',
198 'interfaces/application/shell.mojom',
199 ],
200 },
201 'includes': [ 'tools/bindings/mojom_bindings_generator_explicit.gypi' ],
202 },
203 {
191 # GN version: //mojo/public/interfaces/application:application 204 # GN version: //mojo/public/interfaces/application:application
192 'target_name': 'mojo_application_bindings', 205 'target_name': 'mojo_application_bindings',
193 'type': 'static_library', 206 'type': 'static_library',
194 'sources': [
195 'interfaces/application/application.mojom',
196 'interfaces/application/service_provider.mojom',
197 'interfaces/application/shell.mojom',
198 ],
199 'includes': [ 'tools/bindings/mojom_bindings_generator.gypi' ],
200 'dependencies': [ 207 'dependencies': [
208 'mojo_application_bindings_mojom',
201 'mojo_cpp_bindings', 209 'mojo_cpp_bindings',
202 ], 210 ],
203 'export_dependent_settings': [ 211 'export_dependent_settings': [
204 'mojo_cpp_bindings', 212 'mojo_cpp_bindings',
205 ], 213 ],
206 }, 214 },
207 { 215 {
208 # GN version: //mojo/public/cpp/application 216 # GN version: //mojo/public/cpp/application
209 'target_name': 'mojo_application_base', 217 'target_name': 'mojo_application_base',
210 'type': 'static_library', 218 'type': 'static_library',
(...skipping 11 matching lines...) Expand all
222 'cpp/application/lib/service_connector.cc', 230 'cpp/application/lib/service_connector.cc',
223 'cpp/application/lib/service_connector.h', 231 'cpp/application/lib/service_connector.h',
224 'cpp/application/lib/service_registry.cc', 232 'cpp/application/lib/service_registry.cc',
225 'cpp/application/lib/service_registry.h', 233 'cpp/application/lib/service_registry.h',
226 'cpp/application/lib/weak_service_provider.cc', 234 'cpp/application/lib/weak_service_provider.cc',
227 'cpp/application/lib/weak_service_provider.h', 235 'cpp/application/lib/weak_service_provider.h',
228 'cpp/application/service_provider_impl.h', 236 'cpp/application/service_provider_impl.h',
229 ], 237 ],
230 'dependencies': [ 238 'dependencies': [
231 'mojo_application_bindings', 239 'mojo_application_bindings',
240 'mojo_application_bindings_mojom',
232 ], 241 ],
233 'export_dependent_settings': [ 242 'export_dependent_settings': [
234 'mojo_application_bindings', 243 'mojo_application_bindings',
244 'mojo_application_bindings_mojom',
235 ], 245 ],
236 }, 246 },
237 { 247 {
238 # GN version: //mojo/public/cpp/application:standalone" 248 # GN version: //mojo/public/cpp/application:standalone"
239 'target_name': 'mojo_application_standalone', 249 'target_name': 'mojo_application_standalone',
240 'type': 'static_library', 250 'type': 'static_library',
241 'sources': [ 251 'sources': [
242 'cpp/application/lib/application_runner.cc', 252 'cpp/application/lib/application_runner.cc',
243 'cpp/application/application_runner.h', 253 'cpp/application/application_runner.h',
244 ], 254 ],
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 'type': 'static_library', 316 'type': 'static_library',
307 'dependencies': [ 317 'dependencies': [
308 '../../base/base.gyp:base', 318 '../../base/base.gyp:base',
309 ], 319 ],
310 'sources': [ 320 'sources': [
311 'cpp/bindings/tests/validation_test_input_parser.cc', 321 'cpp/bindings/tests/validation_test_input_parser.cc',
312 'cpp/bindings/tests/validation_test_input_parser.h', 322 'cpp/bindings/tests/validation_test_input_parser.h',
313 ], 323 ],
314 }, 324 },
315 { 325 {
326 'target_name': 'mojo_public_test_interfaces_mojom',
327 'type': 'none',
328 'variables': {
329 'mojom_files': [
330 'interfaces/bindings/tests/math_calculator.mojom',
331 'interfaces/bindings/tests/no_module.mojom',
332 'interfaces/bindings/tests/rect.mojom',
333 'interfaces/bindings/tests/regression_tests.mojom',
334 'interfaces/bindings/tests/sample_factory.mojom',
335 'interfaces/bindings/tests/sample_import.mojom',
336 'interfaces/bindings/tests/sample_import2.mojom',
337 'interfaces/bindings/tests/sample_interfaces.mojom',
338 'interfaces/bindings/tests/sample_service.mojom',
339 'interfaces/bindings/tests/serialization_test_structs.mojom',
340 'interfaces/bindings/tests/test_structs.mojom',
341 'interfaces/bindings/tests/validation_test_interfaces.mojom',
342 ],
343 },
344 'includes': [ 'tools/bindings/mojom_bindings_generator_explicit.gypi' ],
345 },
346 {
316 # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces 347 # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces
317 'target_name': 'mojo_public_test_interfaces', 348 'target_name': 'mojo_public_test_interfaces',
318 'type': 'static_library', 349 'type': 'static_library',
319 'sources': [
320 'interfaces/bindings/tests/math_calculator.mojom',
321 'interfaces/bindings/tests/no_module.mojom',
322 'interfaces/bindings/tests/rect.mojom',
323 'interfaces/bindings/tests/regression_tests.mojom',
324 'interfaces/bindings/tests/sample_factory.mojom',
325 'interfaces/bindings/tests/sample_import.mojom',
326 'interfaces/bindings/tests/sample_import2.mojom',
327 'interfaces/bindings/tests/sample_interfaces.mojom',
328 'interfaces/bindings/tests/sample_service.mojom',
329 'interfaces/bindings/tests/serialization_test_structs.mojom',
330 'interfaces/bindings/tests/test_structs.mojom',
331 'interfaces/bindings/tests/validation_test_interfaces.mojom',
332 ],
333 'includes': [ 'tools/bindings/mojom_bindings_generator.gypi' ],
334 'export_dependent_settings': [ 350 'export_dependent_settings': [
335 'mojo_cpp_bindings', 351 'mojo_cpp_bindings',
336 ], 352 ],
337 'dependencies': [ 353 'dependencies': [
354 'mojo_public_test_interfaces_mojom',
338 'mojo_cpp_bindings', 355 'mojo_cpp_bindings',
339 ], 356 ],
340 }, 357 },
341 ], 358 ],
342 'conditions': [ 359 'conditions': [
343 ['OS == "android"', { 360 ['OS == "android"', {
344 'targets': [ 361 'targets': [
345 { 362 {
346 # GN version: //mojo/public/java_system 363 # GN version: //mojo/public/java_system
347 'target_name': 'mojo_public_java', 364 'target_name': 'mojo_public_java',
(...skipping 12 matching lines...) Expand all
360 }, 377 },
361 'dependencies': [ 378 'dependencies': [
362 'mojo_public_java', 379 'mojo_public_java',
363 ], 380 ],
364 'includes': [ '../../build/java.gypi' ], 381 'includes': [ '../../build/java.gypi' ],
365 }, 382 },
366 ], 383 ],
367 }], 384 }],
368 ], 385 ],
369 } 386 }
OLDNEW
« no previous file with comments | « mojo/public/mojo_application.gni ('k') | mojo/public/python/mojo/bindings/descriptor.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698