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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/mojo.gyp

Issue 422163004: Extract mojo_base.gyp from mojo.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/shell/app_shell.gyp ('k') | mojo/mojo_apps.gypi » ('j') | mojo/mojo_apps.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 0cec9137058d641d830bf2c03934f4757a3fbd53..bfb03661dafc7130e1ff43c7bee3a6cda08c9a95 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -13,75 +13,28 @@
}],
],
},
- 'variables': {
- 'chromium_code': 1,
- 'mojo_shell_debug_url%': "",
- 'conditions': [
- #
- # The following mojo_system-prefixed variables are used to express a
- # dependency on the mojo system APIs.
- #
- # In a component == "shared_library" build, everything can link against
- # mojo_system_impl because it is built as a shared library. However, in a
- # component != "shared_library" build, mojo_system_impl is linked into an
- # executable (e.g., mojo_shell), and must be injected into other shared
- # libraries (i.e., Mojo Apps) that need the mojo system API.
- #
- # For component targets, add <(mojo_system_for_component) to your
- # dependencies section. For loadable module targets (e.g., a Mojo App),
- # add <(mojo_system_for_loadable_module) to your dependencies section.
- #
- # NOTE: component != "shared_library" implies that we are generating a
- # static library, and in that case, it is expected that the target
- # listing the component as a dependency will specify either mojo_system
- # or mojo_system_impl to link against. This enables multiple targets to
- # link against the same component library without having to agree on
- # which Mojo system library they are using.
- #
- ['component=="shared_library"', {
- 'mojo_system_for_component': "mojo_system_impl",
- 'mojo_system_for_loadable_module': "mojo_system_impl",
- }, {
- 'mojo_system_for_component': "mojo_none",
- 'mojo_system_for_loadable_module': "mojo_system",
- }],
- ],
- },
'includes': [
'mojo_apps.gypi',
'mojo_examples.gypi',
- 'mojo_public.gypi',
- 'mojo_public_tests.gypi',
'mojo_services.gypi',
+ 'mojo_variables.gypi',
],
'targets': [
{
'target_name': 'mojo',
'type': 'none',
'dependencies': [
+ 'mojo_base.gyp:mojo_base',
'mojo_apps_js_unittests',
'mojo_compositor_app',
- 'mojo_common_lib',
- 'mojo_common_unittests',
- 'mojo_cpp_bindings',
'mojo_geometry_lib',
'mojo_html_viewer',
'mojo_js',
- 'mojo_js_bindings',
- 'mojo_js_unittests',
'mojo_launcher',
- 'mojo_message_generator',
'mojo_native_viewport_service',
'mojo_network_service',
'mojo_pepper_container_app',
'mojo_png_viewer',
- 'mojo_public_application_unittests',
- 'mojo_public_test_utils',
- 'mojo_public_bindings_unittests',
- 'mojo_public_environment_unittests',
- 'mojo_public_system_perftests',
- 'mojo_public_system_unittests',
- 'mojo_public_utility_unittests',
'mojo_sample_app',
'mojo_service_manager',
'mojo_service_manager_unittests',
@@ -94,12 +47,8 @@
'mojo_surfaces_lib_unittests',
'mojo_surfaces_app',
'mojo_surfaces_service',
- 'mojo_system',
- 'mojo_system_impl',
- 'mojo_system_unittests',
'mojo_test_app',
'mojo_test_request_tracker_app',
- 'mojo_utility',
'mojo_view_manager_lib',
'mojo_view_manager_lib_unittests',
'mojo_wget',
@@ -125,15 +74,6 @@
'mojo_view_manager_unittests',
],
}],
- ['OS == "android"', {
- 'dependencies': [
- 'mojo_bindings_java',
- 'mojo_public_java',
- 'mojo_system_java',
- 'libmojo_system_java',
- 'mojo_test_apk',
- ],
- }],
['OS == "linux"', {
'dependencies': [
'mojo_dbus_echo',
@@ -143,10 +83,6 @@
]
},
{
- 'target_name': 'mojo_none',
- 'type': 'none',
- },
- {
'target_name': 'mojo_external_service_bindings',
'type': 'static_library',
'sources': [
@@ -154,178 +90,10 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_cpp_bindings',
- ],
- },
- {
- 'target_name': 'mojo_run_all_unittests',
- 'type': 'static_library',
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:test_support_base',
- '../testing/gtest.gyp:gtest',
- 'mojo_system_impl',
- 'mojo_test_support',
- 'mojo_test_support_impl',
- ],
- 'sources': [
- 'common/test/run_all_unittests.cc',
- ],
- },
- {
- 'target_name': 'mojo_run_all_perftests',
- 'type': 'static_library',
- 'dependencies': [
- '../base/base.gyp:test_support_base',
- 'mojo_system_impl',
- 'mojo_test_support',
- 'mojo_test_support_impl',
- ],
- 'sources': [
- 'common/test/run_all_perftests.cc',
- ],
- },
- {
- # GN version: //mojo/system
- 'target_name': 'mojo_system_impl',
- 'type': '<(component)',
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- ],
- 'defines': [
- 'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
- 'MOJO_SYSTEM_IMPLEMENTATION',
- 'MOJO_USE_SYSTEM_IMPL',
- ],
- 'sources': [
- 'embedder/channel_init.cc',
- 'embedder/channel_init.h',
- 'embedder/embedder.cc',
- 'embedder/embedder.h',
- 'embedder/platform_channel_pair.cc',
- 'embedder/platform_channel_pair.h',
- 'embedder/platform_channel_pair_posix.cc',
- 'embedder/platform_channel_pair_win.cc',
- 'embedder/platform_channel_utils_posix.cc',
- 'embedder/platform_channel_utils_posix.h',
- 'embedder/platform_handle.cc',
- 'embedder/platform_handle.h',
- 'embedder/platform_handle_utils.h',
- 'embedder/platform_handle_utils_posix.cc',
- 'embedder/platform_handle_utils_win.cc',
- 'embedder/platform_handle_vector.h',
- 'embedder/scoped_platform_handle.h',
- 'system/channel.cc',
- 'system/channel.h',
- 'system/constants.h',
- 'system/core.cc',
- 'system/core.h',
- 'system/data_pipe.cc',
- 'system/data_pipe.h',
- 'system/data_pipe_consumer_dispatcher.cc',
- 'system/data_pipe_consumer_dispatcher.h',
- 'system/data_pipe_producer_dispatcher.cc',
- 'system/data_pipe_producer_dispatcher.h',
- 'system/dispatcher.cc',
- 'system/dispatcher.h',
- 'system/entrypoints.cc',
- 'system/handle_signals_state.h',
- 'system/handle_table.cc',
- 'system/handle_table.h',
- 'system/local_data_pipe.cc',
- 'system/local_data_pipe.h',
- 'system/local_message_pipe_endpoint.cc',
- 'system/local_message_pipe_endpoint.h',
- 'system/mapping_table.cc',
- 'system/mapping_table.h',
- 'system/memory.cc',
- 'system/memory.h',
- 'system/message_in_transit.cc',
- 'system/message_in_transit.h',
- 'system/message_in_transit_queue.cc',
- 'system/message_in_transit_queue.h',
- 'system/message_pipe.cc',
- 'system/message_pipe.h',
- 'system/message_pipe_dispatcher.cc',
- 'system/message_pipe_dispatcher.h',
- 'system/message_pipe_endpoint.cc',
- 'system/message_pipe_endpoint.h',
- 'system/options_validation.h',
- 'system/platform_handle_dispatcher.cc',
- 'system/platform_handle_dispatcher.h',
- 'system/proxy_message_pipe_endpoint.cc',
- 'system/proxy_message_pipe_endpoint.h',
- 'system/raw_channel.cc',
- 'system/raw_channel.h',
- 'system/raw_channel_posix.cc',
- 'system/raw_channel_win.cc',
- 'system/raw_shared_buffer.cc',
- 'system/raw_shared_buffer.h',
- 'system/raw_shared_buffer_posix.cc',
- 'system/raw_shared_buffer_win.cc',
- 'system/shared_buffer_dispatcher.cc',
- 'system/shared_buffer_dispatcher.h',
- 'system/simple_dispatcher.cc',
- 'system/simple_dispatcher.h',
- 'system/transport_data.cc',
- 'system/transport_data.h',
- 'system/waiter.cc',
- 'system/waiter.h',
- 'system/waiter_list.cc',
- 'system/waiter_list.h',
- # Test-only code:
- # TODO(vtl): It's a little unfortunate that these end up in the same
- # component as non-test-only code. In the static build, this code should
- # hopefully be dead-stripped.
- 'embedder/test_embedder.cc',
- 'embedder/test_embedder.h',
- ],
- 'all_dependent_settings': {
- # Ensures that dependent projects import the core functions on Windows.
- 'defines': ['MOJO_USE_SYSTEM_IMPL'],
- }
- },
- {
- 'target_name': 'mojo_system_unittests',
- 'type': 'executable',
- 'dependencies': [
- '../base/base.gyp:base',
- '../testing/gtest.gyp:gtest',
- 'mojo_common_test_support',
- 'mojo_system_impl',
- ],
- 'sources': [
- 'embedder/embedder_unittest.cc',
- 'embedder/platform_channel_pair_posix_unittest.cc',
- 'system/channel_unittest.cc',
- 'system/core_unittest.cc',
- 'system/core_test_base.cc',
- 'system/core_test_base.h',
- 'system/data_pipe_unittest.cc',
- 'system/dispatcher_unittest.cc',
- 'system/local_data_pipe_unittest.cc',
- 'system/memory_unittest.cc',
- 'system/message_pipe_dispatcher_unittest.cc',
- 'system/message_pipe_unittest.cc',
- 'system/multiprocess_message_pipe_unittest.cc',
- 'system/options_validation_unittest.cc',
- 'system/platform_handle_dispatcher_unittest.cc',
- 'system/raw_channel_unittest.cc',
- 'system/raw_shared_buffer_unittest.cc',
- 'system/remote_message_pipe_unittest.cc',
- 'system/run_all_unittests.cc',
- 'system/shared_buffer_dispatcher_unittest.cc',
- 'system/simple_dispatcher_unittest.cc',
- 'system/test_utils.cc',
- 'system/test_utils.h',
- 'system/waiter_list_unittest.cc',
- 'system/waiter_test_utils.cc',
- 'system/waiter_test_utils.h',
- 'system/waiter_unittest.cc',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
},
{
@@ -338,9 +106,9 @@
'../gpu/gpu.gyp:command_buffer_common',
'../gpu/gpu.gyp:gles2_cmd_helper',
'../gpu/gpu.gyp:gles2_implementation',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_gles2',
'mojo_gles2_bindings',
- 'mojo_environment_chromium',
'<(mojo_system_for_component)',
],
'defines': [
@@ -357,159 +125,6 @@
],
},
{
- 'target_name': 'mojo_test_support_impl',
- 'type': 'static_library',
- 'dependencies': [
- '../base/base.gyp:base',
- ],
- 'sources': [
- 'common/test/test_support_impl.cc',
- 'common/test/test_support_impl.h',
- ],
- },
- {
- # GN version: //mojo/common
- 'target_name': 'mojo_common_lib',
- 'type': '<(component)',
- 'defines': [
- 'MOJO_COMMON_IMPLEMENTATION',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../url/url.gyp:url_lib',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '<(mojo_system_for_component)',
- ],
- 'export_dependent_settings': [
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- ],
- 'sources': [
- 'common/common_type_converters.cc',
- 'common/common_type_converters.h',
- 'common/data_pipe_utils.cc',
- 'common/data_pipe_utils.h',
- 'common/handle_watcher.cc',
- 'common/handle_watcher.h',
- 'common/message_pump_mojo.cc',
- 'common/message_pump_mojo.h',
- 'common/message_pump_mojo_handler.h',
- 'common/time_helper.cc',
- 'common/time_helper.h',
- ],
- },
- {
- 'target_name': 'mojo_common_test_support',
- 'type': 'static_library',
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:test_support_base',
- '../testing/gtest.gyp:gtest',
- 'mojo_system_impl',
- ],
- 'sources': [
- 'common/test/multiprocess_test_helper.cc',
- 'common/test/multiprocess_test_helper.h',
- 'common/test/test_utils.h',
- 'common/test/test_utils_posix.cc',
- 'common/test/test_utils_win.cc',
- ],
- },
- {
- 'target_name': 'mojo_common_unittests',
- 'type': 'executable',
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:base_message_loop_tests',
- '../testing/gtest.gyp:gtest',
- '../url/url.gyp:url_lib',
- 'mojo_cpp_bindings',
- 'mojo_environment_chromium',
- 'mojo_common_lib',
- 'mojo_common_test_support',
- 'mojo_public_test_utils',
- 'mojo_run_all_unittests',
- ],
- 'sources': [
- 'common/common_type_converters_unittest.cc',
- 'common/handle_watcher_unittest.cc',
- 'common/message_pump_mojo_unittest.cc',
- 'common/test/multiprocess_test_helper_unittest.cc',
- ],
- },
- {
- # GN version: //mojo/environment:chromium
- 'target_name': 'mojo_environment_chromium',
- 'type': 'static_library',
- 'dependencies': [
- 'mojo_environment_chromium_impl',
- ],
- 'sources': [
- 'environment/environment.cc',
- # TODO(vtl): This is kind of ugly. (See TODO in logging.h.)
- "public/cpp/environment/logging.h",
- "public/cpp/environment/lib/logging.cc",
- ],
- 'include_dirs': [
- '..',
- ],
- 'export_dependent_settings': [
- 'mojo_environment_chromium_impl',
- ],
- },
- {
- # GN version: //mojo/environment:chromium_impl
- 'target_name': 'mojo_environment_chromium_impl',
- 'type': '<(component)',
- 'defines': [
- 'MOJO_ENVIRONMENT_IMPL_IMPLEMENTATION',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- 'mojo_common_lib',
- '<(mojo_system_for_component)',
- ],
- 'sources': [
- 'environment/default_async_waiter_impl.cc',
- 'environment/default_async_waiter_impl.h',
- 'environment/default_logger_impl.cc',
- 'environment/default_logger_impl.h',
- ],
- 'include_dirs': [
- '..',
- ],
- },
- {
- # GN version: //mojo/service_manager
- 'target_name': 'mojo_service_manager',
- 'type': '<(component)',
- 'defines': [
- 'MOJO_SERVICE_MANAGER_IMPLEMENTATION',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../net/net.gyp:net',
- '../url/url.gyp:url_lib',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
- 'mojo_service_provider_bindings',
- '<(mojo_system_for_component)',
- ],
- 'sources': [
- 'service_manager/background_service_loader.cc',
- 'service_manager/background_service_loader.h',
- 'service_manager/service_loader.h',
- 'service_manager/service_manager.cc',
- 'service_manager/service_manager.h',
- 'service_manager/service_manager_export.h',
- ],
- 'export_dependent_settings': [
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- 'mojo_service_provider_bindings',
- ],
- },
- {
'target_name': 'mojo_spy',
'type': 'static_library',
'dependencies': [
@@ -543,16 +158,16 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../net/net.gyp:net',
'../url/url.gyp:url_lib',
- 'mojo_application',
- 'mojo_common_lib',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_service_provider_bindings',
+ 'mojo_base.gyp:mojo_system_impl',
+ 'mojo_base.gyp:mojo_application',
'mojo_external_service_bindings',
'mojo_gles2_impl',
'mojo_native_viewport_service',
'mojo_network_bindings',
'mojo_service_manager',
- 'mojo_service_provider_bindings',
'mojo_spy',
- 'mojo_system_impl',
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'sources': [
@@ -634,9 +249,9 @@
'../base/base.gyp:base',
'../base/base.gyp:base_static',
'../url/url.gyp:url_lib',
+ 'mojo_base.gyp:mojo_system_impl',
'mojo_service_manager',
'mojo_shell_lib',
- 'mojo_system_impl',
],
'sources': [
'shell/shell_test_helper.cc',
@@ -650,11 +265,11 @@
'../base/base.gyp:base',
'../ui/gl/gl.gyp:gl',
'../url/url.gyp:url_lib',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_system_impl',
'mojo_service_manager',
'mojo_shell_lib',
- 'mojo_system_impl',
],
'conditions': [
['use_ozone==1', {
@@ -679,11 +294,11 @@
# TODO(vtl): We don't currently need this, but I imagine we will soon.
# '../ui/gl/gl.gyp:gl',
'../url/url.gyp:url_lib',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_system_impl',
'mojo_service_manager',
'mojo_shell_lib',
- 'mojo_system_impl',
'mojo_test_app',
'mojo_test_request_tracker_app',
'mojo_test_service_bindings',
@@ -706,65 +321,53 @@
],
},
{
- 'target_name': 'mojo_service_manager_unittests',
- 'type': 'executable',
+ # GN version: //mojo/service_manager
+ 'target_name': 'mojo_service_manager',
+ 'type': '<(component)',
+ 'defines': [
+ 'MOJO_SERVICE_MANAGER_IMPLEMENTATION',
+ ],
'dependencies': [
'../base/base.gyp:base',
- '../testing/gtest.gyp:gtest',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../net/net.gyp:net',
'../url/url.gyp:url_lib',
- 'mojo_common_lib',
- 'mojo_cpp_bindings',
- 'mojo_environment_chromium',
- 'mojo_run_all_unittests',
- 'mojo_service_manager',
- 'mojo_application',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_service_provider_bindings',
+ '<(mojo_system_for_component)',
],
- 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'sources': [
- 'service_manager/service_manager_unittest.cc',
- 'service_manager/test.mojom',
- ],
- },
- {
- # GN version: //mojo/bindings/js
- 'target_name': 'mojo_js_bindings_lib',
- 'type': 'static_library',
- 'dependencies': [
- '../base/base.gyp:base',
- '../gin/gin.gyp:gin',
- '../v8/tools/gyp/v8.gyp:v8',
- 'mojo_common_lib',
+ 'service_manager/background_service_loader.cc',
+ 'service_manager/background_service_loader.h',
+ 'service_manager/service_loader.h',
+ 'service_manager/service_manager.cc',
+ 'service_manager/service_manager.h',
+ 'service_manager/service_manager_export.h',
],
'export_dependent_settings': [
- '../base/base.gyp:base',
- '../gin/gin.gyp:gin',
- 'mojo_common_lib',
- ],
- 'sources': [
- # Sources list duplicated in GN build.
- 'bindings/js/core.cc',
- 'bindings/js/core.h',
- 'bindings/js/handle.cc',
- 'bindings/js/handle.h',
- 'bindings/js/support.cc',
- 'bindings/js/support.h',
- 'bindings/js/waiting_callback.cc',
- 'bindings/js/waiting_callback.h',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ 'mojo_base.gyp:mojo_service_provider_bindings',
],
},
{
- 'target_name': 'mojo_message_generator',
+ 'target_name': 'mojo_service_manager_unittests',
'type': 'executable',
'dependencies': [
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
- 'mojo_common_lib',
- 'mojo_cpp_bindings',
- 'mojo_environment_chromium',
- 'mojo_system_impl',
+ '../url/url.gyp:url_lib',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_run_all_unittests',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_service_manager',
],
+ 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'sources': [
- 'tools/message_generator.cc',
+ 'service_manager/service_manager_unittest.cc',
+ 'service_manager/test.mojom',
],
},
{
@@ -787,95 +390,6 @@
['OS=="android"', {
'targets': [
{
- 'target_name': 'mojo_jni_headers',
- 'type': 'none',
- 'dependencies': [
- 'mojo_java_set_jni_headers',
- ],
- 'sources': [
- 'android/javatests/src/org/chromium/mojo/MojoTestCase.java',
- 'android/system/src/org/chromium/mojo/system/impl/CoreImpl.java',
- 'services/native_viewport/android/src/org/chromium/mojo/NativeViewportAndroid.java',
- 'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java',
- ],
- 'variables': {
- 'jni_gen_package': 'mojo',
- },
- 'includes': [ '../build/jni_generator.gypi' ],
- },
- {
- 'target_name': 'mojo_system_java',
- 'type': 'none',
- 'dependencies': [
- '../base/base.gyp:base_java',
- 'mojo_public_java',
- ],
- 'variables': {
- 'java_in_dir': '<(DEPTH)/mojo/android/system',
- },
- 'includes': [ '../build/java.gypi' ],
- },
- {
- 'target_name': 'libmojo_system_java',
- 'type': 'static_library',
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
- 'mojo_jni_headers',
- 'mojo_service_provider_bindings',
- 'mojo_shell_lib',
- ],
- 'sources': [
- 'android/system/core_impl.cc',
- 'android/system/core_impl.h',
- ],
- },
- {
- 'target_name': 'libmojo_java_unittest',
- 'type': 'shared_library',
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:test_support_base',
- 'libmojo_system_java',
- 'mojo_jni_headers',
- ],
- 'defines': [
- 'UNIT_TEST' # As exported from testing/gtest.gyp:gtest.
- ],
- 'sources': [
- 'android/javatests/mojo_test_case.cc',
- 'android/javatests/mojo_test_case.h',
- 'android/javatests/init_library.cc',
- ],
- },
- {
- 'target_name': 'mojo_test_apk',
- 'type': 'none',
- 'dependencies': [
- 'mojo_bindings_java',
- 'mojo_public_test_interfaces',
- 'mojo_system_java',
- '../base/base.gyp:base_java_test_support',
- ],
- 'variables': {
- 'apk_name': 'MojoTest',
- 'java_in_dir': '<(DEPTH)/mojo/android/javatests',
- 'resource_dir': '<(DEPTH)/mojo/android/javatests/apk',
- 'native_lib_target': 'libmojo_java_unittest',
- 'is_test_apk': 1,
- # Given that this apk tests itself, it needs to bring emma with it
- # when instrumented.
- 'conditions': [
- ['emma_coverage != 0', {
- 'emma_instrument': 1,
- }],
- ],
- },
- 'includes': [ '../build/java_apk.gypi' ],
- },
- {
'target_name': 'mojo_native_viewport_java',
'type': 'none',
'dependencies': [
@@ -887,15 +401,6 @@
'includes': [ '../build/java.gypi' ],
},
{
- 'target_name': 'mojo_java_set_jni_headers',
- 'type': 'none',
- 'variables': {
- 'jni_gen_package': 'mojo',
- 'input_java_class': 'java/util/HashSet.class',
- },
- 'includes': [ '../build/jar_file_jni_generator.gypi' ],
- },
- {
'target_name': 'libmojo_shell',
'type': 'shared_library',
'dependencies': [
@@ -904,10 +409,10 @@
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gl/gl.gyp:gl',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
- 'mojo_jni_headers',
- 'mojo_service_provider_bindings',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_jni_headers',
+ 'mojo_base.gyp:mojo_service_provider_bindings',
'mojo_shell_lib',
],
'sources': [
@@ -944,10 +449,10 @@
'../base/base.gyp:base',
'../build/linux/system.gyp:dbus',
'../dbus/dbus.gyp:dbus',
- 'mojo_common_lib',
+ 'mojo_base.gyp:mojo_common_lib',
viettrungluu 2014/07/28 22:51:32 nit: maybe it'd be better to list all the mojo_bas
Hajime Morrita 2014/07/28 23:04:08 Done.
+ 'mojo_base.gyp:mojo_system_impl',
'mojo_external_service_bindings',
- 'mojo_application',
- 'mojo_system_impl',
+ 'mojo_base.gyp:mojo_application',
],
'sources': [
'dbus/dbus_external_service.h',
@@ -956,24 +461,6 @@
},
],
}],
- ['test_isolation_mode != "noop"', {
- 'targets': [
- {
- 'target_name': 'mojo_js_unittests_run',
- 'type': 'none',
- 'dependencies': [
- 'mojo_js_unittests',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'mojo_js_unittests.isolate',
- ],
- 'sources': [
- 'mojo_js_unittests.isolate',
- ],
- },
- ],
- }],
['use_aura==1', {
'targets': [
{
« no previous file with comments | « extensions/shell/app_shell.gyp ('k') | mojo/mojo_apps.gypi » ('j') | mojo/mojo_apps.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698