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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/mojo/mojo_public.gyp

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/mojo/mojo_edk_tests.gyp ('k') | third_party/mojo/mojo_variables.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mojo/mojo_public.gyp
diff --git a/third_party/mojo/mojo_public.gyp b/third_party/mojo/mojo_public.gyp
index 5d4b47386d3953302c98595ee3b04bca09265987..62991f92223c67656e983598bbccc9644ccd3d1b 100644
--- a/third_party/mojo/mojo_public.gyp
+++ b/third_party/mojo/mojo_public.gyp
@@ -49,8 +49,8 @@
],
},
'sources': [
- 'src/mojo/public/platform/native/system_thunks.cc',
- 'src/mojo/public/platform/native/system_thunks.h',
+ '../../mojo/public/platform/native/system_thunks.cc',
+ '../../mojo/public/platform/native/system_thunks.h',
],
'dependencies': [
'mojo_system_headers',
@@ -61,14 +61,14 @@
'target_name': 'mojo_system_headers',
'type': 'none',
'sources': [
- 'src/mojo/public/c/system/buffer.h',
- 'src/mojo/public/c/system/core.h',
- 'src/mojo/public/c/system/data_pipe.h',
- 'src/mojo/public/c/system/functions.h',
- 'src/mojo/public/c/system/macros.h',
- 'src/mojo/public/c/system/message_pipe.h',
- 'src/mojo/public/c/system/system_export.h',
- 'src/mojo/public/c/system/types.h',
+ '../../mojo/public/c/system/buffer.h',
+ '../../mojo/public/c/system/core.h',
+ '../../mojo/public/c/system/data_pipe.h',
+ '../../mojo/public/c/system/functions.h',
+ '../../mojo/public/c/system/macros.h',
+ '../../mojo/public/c/system/message_pipe.h',
+ '../../mojo/public/c/system/system_export.h',
+ '../../mojo/public/c/system/types.h',
],
},
{
@@ -76,13 +76,13 @@
'target_name': 'mojo_system_cpp_headers',
'type': 'none',
'sources': [
- 'src/mojo/public/cpp/system/buffer.h',
- 'src/mojo/public/cpp/system/core.h',
- 'src/mojo/public/cpp/system/data_pipe.h',
- 'src/mojo/public/cpp/system/functions.h',
- 'src/mojo/public/cpp/system/handle.h',
- 'src/mojo/public/cpp/system/macros.h',
- 'src/mojo/public/cpp/system/message_pipe.h',
+ '../../mojo/public/cpp/system/buffer.h',
+ '../../mojo/public/cpp/system/core.h',
+ '../../mojo/public/cpp/system/data_pipe.h',
+ '../../mojo/public/cpp/system/functions.h',
+ '../../mojo/public/cpp/system/handle.h',
+ '../../mojo/public/cpp/system/macros.h',
+ '../../mojo/public/cpp/system/message_pipe.h',
],
'dependencies': [
'mojo_system_headers',
@@ -96,64 +96,64 @@
'../..'
],
'sources': [
- 'src/mojo/public/cpp/bindings/array.h',
- 'src/mojo/public/cpp/bindings/binding.h',
- 'src/mojo/public/cpp/bindings/callback.h',
- 'src/mojo/public/cpp/bindings/interface_ptr.h',
- 'src/mojo/public/cpp/bindings/interface_request.h',
- 'src/mojo/public/cpp/bindings/message.h',
- 'src/mojo/public/cpp/bindings/message_filter.h',
- 'src/mojo/public/cpp/bindings/no_interface.h',
- 'src/mojo/public/cpp/bindings/string.h',
- 'src/mojo/public/cpp/bindings/strong_binding.h',
- 'src/mojo/public/cpp/bindings/type_converter.h',
- 'src/mojo/public/cpp/bindings/lib/array_internal.h',
- 'src/mojo/public/cpp/bindings/lib/array_internal.cc',
- 'src/mojo/public/cpp/bindings/lib/array_serialization.h',
- 'src/mojo/public/cpp/bindings/lib/bindings_internal.h',
- 'src/mojo/public/cpp/bindings/lib/bindings_serialization.cc',
- 'src/mojo/public/cpp/bindings/lib/bindings_serialization.h',
- 'src/mojo/public/cpp/bindings/lib/bounds_checker.cc',
- 'src/mojo/public/cpp/bindings/lib/bounds_checker.h',
- 'src/mojo/public/cpp/bindings/lib/buffer.h',
- 'src/mojo/public/cpp/bindings/lib/callback_internal.h',
- 'src/mojo/public/cpp/bindings/lib/connector.cc',
- 'src/mojo/public/cpp/bindings/lib/connector.h',
- 'src/mojo/public/cpp/bindings/lib/control_message_handler.cc',
- 'src/mojo/public/cpp/bindings/lib/control_message_handler.h',
- 'src/mojo/public/cpp/bindings/lib/control_message_proxy.cc',
- 'src/mojo/public/cpp/bindings/lib/control_message_proxy.h',
- 'src/mojo/public/cpp/bindings/lib/filter_chain.cc',
- 'src/mojo/public/cpp/bindings/lib/filter_chain.h',
- 'src/mojo/public/cpp/bindings/lib/fixed_buffer.cc',
- 'src/mojo/public/cpp/bindings/lib/fixed_buffer.h',
- 'src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h',
- 'src/mojo/public/cpp/bindings/lib/map_data_internal.h',
- 'src/mojo/public/cpp/bindings/lib/map_internal.h',
- 'src/mojo/public/cpp/bindings/lib/map_serialization.h',
- 'src/mojo/public/cpp/bindings/lib/message.cc',
- 'src/mojo/public/cpp/bindings/lib/message_builder.cc',
- 'src/mojo/public/cpp/bindings/lib/message_builder.h',
- 'src/mojo/public/cpp/bindings/lib/message_filter.cc',
- 'src/mojo/public/cpp/bindings/lib/message_header_validator.cc',
- 'src/mojo/public/cpp/bindings/lib/message_header_validator.h',
- 'src/mojo/public/cpp/bindings/lib/message_internal.h',
- 'src/mojo/public/cpp/bindings/lib/no_interface.cc',
- 'src/mojo/public/cpp/bindings/lib/router.cc',
- 'src/mojo/public/cpp/bindings/lib/router.h',
- 'src/mojo/public/cpp/bindings/lib/shared_data.h',
- 'src/mojo/public/cpp/bindings/lib/shared_ptr.h',
- 'src/mojo/public/cpp/bindings/lib/string_serialization.h',
- 'src/mojo/public/cpp/bindings/lib/string_serialization.cc',
- 'src/mojo/public/cpp/bindings/lib/thread_checker.h',
- 'src/mojo/public/cpp/bindings/lib/thread_checker_posix.cc',
- 'src/mojo/public/cpp/bindings/lib/thread_checker_posix.h',
- 'src/mojo/public/cpp/bindings/lib/validate_params.h',
- 'src/mojo/public/cpp/bindings/lib/validation_errors.cc',
- 'src/mojo/public/cpp/bindings/lib/validation_errors.h',
- 'src/mojo/public/cpp/bindings/lib/validation_util.cc',
- 'src/mojo/public/cpp/bindings/lib/validation_util.h',
- 'src/mojo/public/cpp/bindings/lib/value_traits.h',
+ '../../mojo/public/cpp/bindings/array.h',
+ '../../mojo/public/cpp/bindings/binding.h',
+ '../../mojo/public/cpp/bindings/callback.h',
+ '../../mojo/public/cpp/bindings/interface_ptr.h',
+ '../../mojo/public/cpp/bindings/interface_request.h',
+ '../../mojo/public/cpp/bindings/lib/array_internal.cc',
+ '../../mojo/public/cpp/bindings/lib/array_internal.h',
+ '../../mojo/public/cpp/bindings/lib/array_serialization.h',
+ '../../mojo/public/cpp/bindings/lib/bindings_internal.h',
+ '../../mojo/public/cpp/bindings/lib/bindings_serialization.cc',
+ '../../mojo/public/cpp/bindings/lib/bindings_serialization.h',
+ '../../mojo/public/cpp/bindings/lib/bounds_checker.cc',
+ '../../mojo/public/cpp/bindings/lib/bounds_checker.h',
+ '../../mojo/public/cpp/bindings/lib/buffer.h',
+ '../../mojo/public/cpp/bindings/lib/callback_internal.h',
+ '../../mojo/public/cpp/bindings/lib/connector.cc',
+ '../../mojo/public/cpp/bindings/lib/connector.h',
+ '../../mojo/public/cpp/bindings/lib/control_message_handler.cc',
+ '../../mojo/public/cpp/bindings/lib/control_message_handler.h',
+ '../../mojo/public/cpp/bindings/lib/control_message_proxy.cc',
+ '../../mojo/public/cpp/bindings/lib/control_message_proxy.h',
+ '../../mojo/public/cpp/bindings/lib/filter_chain.cc',
+ '../../mojo/public/cpp/bindings/lib/filter_chain.h',
+ '../../mojo/public/cpp/bindings/lib/fixed_buffer.cc',
+ '../../mojo/public/cpp/bindings/lib/fixed_buffer.h',
+ '../../mojo/public/cpp/bindings/lib/interface_ptr_internal.h',
+ '../../mojo/public/cpp/bindings/lib/map_data_internal.h',
+ '../../mojo/public/cpp/bindings/lib/map_internal.h',
+ '../../mojo/public/cpp/bindings/lib/map_serialization.h',
+ '../../mojo/public/cpp/bindings/lib/message.cc',
+ '../../mojo/public/cpp/bindings/lib/message_builder.cc',
+ '../../mojo/public/cpp/bindings/lib/message_builder.h',
+ '../../mojo/public/cpp/bindings/lib/message_filter.cc',
+ '../../mojo/public/cpp/bindings/lib/message_header_validator.cc',
+ '../../mojo/public/cpp/bindings/lib/message_header_validator.h',
+ '../../mojo/public/cpp/bindings/lib/message_internal.h',
+ '../../mojo/public/cpp/bindings/lib/no_interface.cc',
+ '../../mojo/public/cpp/bindings/lib/router.cc',
+ '../../mojo/public/cpp/bindings/lib/router.h',
+ '../../mojo/public/cpp/bindings/lib/shared_data.h',
+ '../../mojo/public/cpp/bindings/lib/shared_ptr.h',
+ '../../mojo/public/cpp/bindings/lib/string_serialization.cc',
+ '../../mojo/public/cpp/bindings/lib/string_serialization.h',
+ '../../mojo/public/cpp/bindings/lib/thread_checker.h',
+ '../../mojo/public/cpp/bindings/lib/thread_checker_posix.cc',
+ '../../mojo/public/cpp/bindings/lib/thread_checker_posix.h',
+ '../../mojo/public/cpp/bindings/lib/validate_params.h',
+ '../../mojo/public/cpp/bindings/lib/validation_errors.cc',
+ '../../mojo/public/cpp/bindings/lib/validation_errors.h',
+ '../../mojo/public/cpp/bindings/lib/validation_util.cc',
+ '../../mojo/public/cpp/bindings/lib/validation_util.h',
+ '../../mojo/public/cpp/bindings/lib/value_traits.h',
+ '../../mojo/public/cpp/bindings/message.h',
+ '../../mojo/public/cpp/bindings/message_filter.h',
+ '../../mojo/public/cpp/bindings/no_interface.h',
+ '../../mojo/public/cpp/bindings/string.h',
+ '../../mojo/public/cpp/bindings/strong_binding.h',
+ '../../mojo/public/cpp/bindings/type_converter.h',
# This comes from the mojo_interface_bindings_cpp_sources dependency.
'>@(mojom_generated_sources)',
],
@@ -169,8 +169,8 @@
'../..'
],
'sources': [
- 'src/mojo/public/js/constants.cc',
- 'src/mojo/public/js/constants.h',
+ '../../mojo/public/js/constants.cc',
+ '../../mojo/public/js/constants.h',
],
},
{
@@ -178,23 +178,23 @@
'target_name': 'mojo_environment_standalone',
'type': 'static_library',
'sources': [
- 'src/mojo/public/c/environment/async_waiter.h',
- 'src/mojo/public/c/environment/logger.h',
- 'src/mojo/public/cpp/environment/async_waiter.h',
- 'src/mojo/public/cpp/environment/environment.h',
- 'src/mojo/public/cpp/environment/lib/async_waiter.cc',
- 'src/mojo/public/cpp/environment/lib/default_async_waiter.cc',
- 'src/mojo/public/cpp/environment/lib/default_async_waiter.h',
- 'src/mojo/public/cpp/environment/lib/default_logger.cc',
- 'src/mojo/public/cpp/environment/lib/default_logger.h',
- 'src/mojo/public/cpp/environment/lib/default_task_tracker.cc',
- 'src/mojo/public/cpp/environment/lib/default_task_tracker.h',
- 'src/mojo/public/cpp/environment/lib/environment.cc',
- 'src/mojo/public/cpp/environment/lib/logging.cc',
- 'src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc',
- 'src/mojo/public/cpp/environment/lib/scoped_task_tracking.h',
- 'src/mojo/public/cpp/environment/logging.h',
- 'src/mojo/public/cpp/environment/task_tracker.h',
+ '../../mojo/public/c/environment/async_waiter.h',
+ '../../mojo/public/c/environment/logger.h',
+ '../../mojo/public/cpp/environment/async_waiter.h',
+ '../../mojo/public/cpp/environment/environment.h',
+ '../../mojo/public/cpp/environment/lib/async_waiter.cc',
+ '../../mojo/public/cpp/environment/lib/default_async_waiter.cc',
+ '../../mojo/public/cpp/environment/lib/default_async_waiter.h',
+ '../../mojo/public/cpp/environment/lib/default_logger.cc',
+ '../../mojo/public/cpp/environment/lib/default_logger.h',
+ '../../mojo/public/cpp/environment/lib/default_task_tracker.cc',
+ '../../mojo/public/cpp/environment/lib/default_task_tracker.h',
+ '../../mojo/public/cpp/environment/lib/environment.cc',
+ '../../mojo/public/cpp/environment/lib/logging.cc',
+ '../../mojo/public/cpp/environment/lib/scoped_task_tracking.cc',
+ '../../mojo/public/cpp/environment/lib/scoped_task_tracking.h',
+ '../../mojo/public/cpp/environment/logging.h',
+ '../../mojo/public/cpp/environment/task_tracker.h',
],
'include_dirs': [
'../..',
@@ -205,25 +205,25 @@
'target_name': 'mojo_utility',
'type': 'static_library',
'sources': [
- 'src/mojo/public/cpp/utility/mutex.h',
- 'src/mojo/public/cpp/utility/run_loop.h',
- 'src/mojo/public/cpp/utility/run_loop_handler.h',
- 'src/mojo/public/cpp/utility/thread.h',
- 'src/mojo/public/cpp/utility/lib/mutex.cc',
- 'src/mojo/public/cpp/utility/lib/run_loop.cc',
- 'src/mojo/public/cpp/utility/lib/thread.cc',
- 'src/mojo/public/cpp/utility/lib/thread_local.h',
- 'src/mojo/public/cpp/utility/lib/thread_local_posix.cc',
- 'src/mojo/public/cpp/utility/lib/thread_local_win.cc',
+ '../../mojo/public/cpp/utility/lib/mutex.cc',
+ '../../mojo/public/cpp/utility/lib/run_loop.cc',
+ '../../mojo/public/cpp/utility/lib/thread.cc',
+ '../../mojo/public/cpp/utility/lib/thread_local.h',
+ '../../mojo/public/cpp/utility/lib/thread_local_posix.cc',
+ '../../mojo/public/cpp/utility/lib/thread_local_win.cc',
+ '../../mojo/public/cpp/utility/mutex.h',
+ '../../mojo/public/cpp/utility/run_loop.h',
+ '../../mojo/public/cpp/utility/run_loop_handler.h',
+ '../../mojo/public/cpp/utility/thread.h',
],
'conditions': [
# See crbug.com/342893:
['OS=="win"', {
'sources!': [
- 'src/mojo/public/cpp/utility/mutex.h',
- 'src/mojo/public/cpp/utility/thread.h',
- 'src/mojo/public/cpp/utility/lib/mutex.cc',
- 'src/mojo/public/cpp/utility/lib/thread.cc',
+ '../../mojo/public/cpp/utility/lib/mutex.cc',
+ '../../mojo/public/cpp/utility/lib/thread.cc',
+ '../../mojo/public/cpp/utility/mutex.h',
+ '../../mojo/public/cpp/utility/thread.h',
],
}],
],
@@ -237,7 +237,7 @@
'variables': {
'require_interface_bindings': 0,
'mojom_files': [
- 'src/mojo/public/interfaces/bindings/interface_control_messages.mojom',
+ '../../mojo/public/interfaces/bindings/interface_control_messages.mojom',
],
},
'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
@@ -274,11 +274,11 @@
],
},
'sources': [
- 'src/mojo/public/c/test_support/test_support.h',
- 'src/mojo/public/c/test_support/test_support_export.h',
+ '../../mojo/public/c/test_support/test_support.h',
+ '../../mojo/public/c/test_support/test_support_export.h',
# TODO(vtl): Convert this to thunks http://crbug.com/386799
- 'src/mojo/public/tests/test_support_private.cc',
- 'src/mojo/public/tests/test_support_private.h',
+ '../../mojo/public/tests/test_support_private.cc',
+ '../../mojo/public/tests/test_support_private.h',
],
'conditions': [
['OS=="ios"', {
@@ -304,9 +304,9 @@
'mojo_public_test_support',
],
'sources': [
- 'src/mojo/public/cpp/test_support/lib/test_support.cc',
- 'src/mojo/public/cpp/test_support/lib/test_utils.cc',
- 'src/mojo/public/cpp/test_support/test_utils.h',
+ '../../mojo/public/cpp/test_support/lib/test_support.cc',
+ '../../mojo/public/cpp/test_support/lib/test_utils.cc',
+ '../../mojo/public/cpp/test_support/test_utils.h',
],
},
{
@@ -317,8 +317,8 @@
'../../base/base.gyp:base',
],
'sources': [
- 'src/mojo/public/cpp/bindings/tests/validation_test_input_parser.cc',
- 'src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h',
+ '../../mojo/public/cpp/bindings/tests/validation_test_input_parser.cc',
+ '../../mojo/public/cpp/bindings/tests/validation_test_input_parser.h',
],
},
{
@@ -326,20 +326,20 @@
'type': 'none',
'variables': {
'mojom_files': [
- 'src/mojo/public/interfaces/bindings/tests/math_calculator.mojom',
- 'src/mojo/public/interfaces/bindings/tests/no_module.mojom',
- 'src/mojo/public/interfaces/bindings/tests/ping_service.mojom',
- 'src/mojo/public/interfaces/bindings/tests/rect.mojom',
- 'src/mojo/public/interfaces/bindings/tests/regression_tests.mojom',
- 'src/mojo/public/interfaces/bindings/tests/sample_factory.mojom',
- 'src/mojo/public/interfaces/bindings/tests/sample_import.mojom',
- 'src/mojo/public/interfaces/bindings/tests/sample_import2.mojom',
- 'src/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom',
- 'src/mojo/public/interfaces/bindings/tests/sample_service.mojom',
- 'src/mojo/public/interfaces/bindings/tests/scoping.mojom',
- 'src/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom',
- 'src/mojo/public/interfaces/bindings/tests/test_structs.mojom',
- 'src/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom',
+ '../../mojo/public/interfaces/bindings/tests/math_calculator.mojom',
+ '../../mojo/public/interfaces/bindings/tests/no_module.mojom',
+ '../../mojo/public/interfaces/bindings/tests/ping_service.mojom',
+ '../../mojo/public/interfaces/bindings/tests/rect.mojom',
+ '../../mojo/public/interfaces/bindings/tests/regression_tests.mojom',
+ '../../mojo/public/interfaces/bindings/tests/sample_factory.mojom',
+ '../../mojo/public/interfaces/bindings/tests/sample_import.mojom',
+ '../../mojo/public/interfaces/bindings/tests/sample_import2.mojom',
+ '../../mojo/public/interfaces/bindings/tests/sample_interfaces.mojom',
+ '../../mojo/public/interfaces/bindings/tests/sample_service.mojom',
+ '../../mojo/public/interfaces/bindings/tests/scoping.mojom',
+ '../../mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom',
+ '../../mojo/public/interfaces/bindings/tests/test_structs.mojom',
+ '../../mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom',
],
},
'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
@@ -366,7 +366,7 @@
'type': 'none',
'variables': {
'chromium_code': 0,
- 'java_in_dir': 'src/mojo/public/java/system',
+ 'java_in_dir': '../../mojo/public/java/system',
},
'includes': [ '../../build/java.gypi' ],
},
@@ -383,7 +383,7 @@
'type': 'none',
'variables': {
'chromium_code': 0,
- 'java_in_dir': 'src/mojo/public/java/bindings',
+ 'java_in_dir': '../../mojo/public/java/bindings',
},
'dependencies': [
'mojo_interface_bindings_java_sources',
« no previous file with comments | « third_party/mojo/mojo_edk_tests.gyp ('k') | third_party/mojo/mojo_variables.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698