| OLD | NEW |
| 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 'target_defaults' : { | 9 'target_defaults' : { |
| 10 'include_dirs': [ | 10 'include_dirs': [ |
| 11 '..', | 11 '..', |
| 12 ], | 12 ], |
| 13 }, | 13 }, |
| 14 'targets': [ | 14 'targets': [ |
| 15 { | 15 { |
| 16 'target_name': 'mojo_public', | 16 'target_name': 'mojo_public', |
| 17 'type': 'none', | 17 'type': 'none', |
| 18 'dependencies': [ | 18 'dependencies': [ |
| 19 'mojo_js_bindings', | 19 'mojo_js_bindings', |
| 20 'mojo_public_test_interfaces', | 20 'mojo_public_test_interfaces', |
| 21 'mojo_public_test_utils', | 21 'mojo_public_test_utils', |
| 22 'mojo_system', | 22 'mojo_system', |
| 23 'mojo_utility', | |
| 24 ], | 23 ], |
| 25 }, | 24 }, |
| 26 { | 25 { |
| 27 # Targets that (a) need to obtain the settings that mojo_system passes on | 26 # Targets that (a) need to obtain the settings that mojo_system passes on |
| 28 # to its direct dependents but (b) are not themselves in a position to | 27 # to its direct dependents but (b) are not themselves in a position to |
| 29 # hardcode a dependency to mojo_system vs. mojo_system_impl (e.g., | 28 # hardcode a dependency to mojo_system vs. mojo_system_impl (e.g., |
| 30 # because they are components) should depend on this target. | 29 # because they are components) should depend on this target. |
| 31 'target_name': 'mojo_system_placeholder', | 30 'target_name': 'mojo_system_placeholder', |
| 32 'type': 'none', | 31 'type': 'none', |
| 33 }, | 32 }, |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 'type': 'static_library', | 224 'type': 'static_library', |
| 226 'include_dirs': [ | 225 'include_dirs': [ |
| 227 '..' | 226 '..' |
| 228 ], | 227 ], |
| 229 'sources': [ | 228 'sources': [ |
| 230 'public/js/constants.cc', | 229 'public/js/constants.cc', |
| 231 'public/js/constants.h', | 230 'public/js/constants.h', |
| 232 ], | 231 ], |
| 233 }, | 232 }, |
| 234 { | 233 { |
| 235 # GN version: //mojo/public/cpp/utility | |
| 236 'target_name': 'mojo_utility', | |
| 237 'type': 'static_library', | |
| 238 'sources': [ | |
| 239 'public/cpp/utility/lib/mutex.cc', | |
| 240 'public/cpp/utility/lib/run_loop.cc', | |
| 241 'public/cpp/utility/lib/thread.cc', | |
| 242 'public/cpp/utility/lib/thread_local.h', | |
| 243 'public/cpp/utility/lib/thread_local_posix.cc', | |
| 244 'public/cpp/utility/lib/thread_local_win.cc', | |
| 245 'public/cpp/utility/mutex.h', | |
| 246 'public/cpp/utility/run_loop.h', | |
| 247 'public/cpp/utility/run_loop_handler.h', | |
| 248 'public/cpp/utility/thread.h', | |
| 249 ], | |
| 250 'conditions': [ | |
| 251 # See crbug.com/342893: | |
| 252 ['OS=="win"', { | |
| 253 'sources!': [ | |
| 254 'public/cpp/utility/lib/mutex.cc', | |
| 255 'public/cpp/utility/lib/thread.cc', | |
| 256 'public/cpp/utility/mutex.h', | |
| 257 'public/cpp/utility/thread.h', | |
| 258 ], | |
| 259 }], | |
| 260 ], | |
| 261 'include_dirs': [ | |
| 262 '..', | |
| 263 ], | |
| 264 }, | |
| 265 { | |
| 266 'target_name': 'mojo_interface_bindings_mojom', | 234 'target_name': 'mojo_interface_bindings_mojom', |
| 267 'type': 'none', | 235 'type': 'none', |
| 268 'variables': { | 236 'variables': { |
| 269 'require_interface_bindings': 0, | 237 'require_interface_bindings': 0, |
| 270 'mojom_files': [ | 238 'mojom_files': [ |
| 271 'public/interfaces/bindings/interface_control_messages.mojom', | 239 'public/interfaces/bindings/interface_control_messages.mojom', |
| 272 'public/interfaces/bindings/pipe_control_messages.mojom', | 240 'public/interfaces/bindings/pipe_control_messages.mojom', |
| 273 ], | 241 ], |
| 274 }, | 242 }, |
| 275 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], | 243 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 521 'mojo_interface_bindings_java_sources', | 489 'mojo_interface_bindings_java_sources', |
| 522 'mojo_public_java', | 490 'mojo_public_java', |
| 523 '<(DEPTH)/base/base.gyp:base_java', | 491 '<(DEPTH)/base/base.gyp:base_java', |
| 524 ], | 492 ], |
| 525 'includes': [ '../build/java.gypi' ], | 493 'includes': [ '../build/java.gypi' ], |
| 526 }, | 494 }, |
| 527 ], | 495 ], |
| 528 }], | 496 }], |
| 529 ], | 497 ], |
| 530 } | 498 } |
| OLD | NEW |