diff options
| author | jamesr <jamesr@chromium.org> | 2014-10-07 13:31:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 20:31:58 +0000 |
| commit | 777e37d8d95e282d7e3bef85a6cdac46ccef570d (patch) | |
| tree | e54db3d19510dcfddf3bcb95c16bbcedc5d23c06 /mojo/mojo.gyp | |
| parent | e48457c33ad890f8b55f0eeeb36b21050950977d (diff) | |
| download | chromium_src-777e37d8d95e282d7e3bef85a6cdac46ccef570d.zip chromium_src-777e37d8d95e282d7e3bef85a6cdac46ccef570d.tar.gz chromium_src-777e37d8d95e282d7e3bef85a6cdac46ccef570d.tar.bz2 | |
Move mojo/edk gyp targets in to mojo/edk/mojo_edk.gyp
R=viettrungluu@chromium.org
TBR=darin@chromium.org for updates to various gyp files to point to moved targets
Review URL: https://codereview.chromium.org/596053004
Cr-Commit-Position: refs/heads/master@{#298560}
Diffstat (limited to 'mojo/mojo.gyp')
| -rw-r--r-- | mojo/mojo.gyp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp index e927a20..3d23d25 100644 --- a/mojo/mojo.gyp +++ b/mojo/mojo.gyp @@ -25,6 +25,7 @@ 'target_name': 'mojo', 'type': 'none', 'dependencies': [ + 'edk/mojo_edk.gyp:mojo_edk', 'mojo_application_manager', 'mojo_application_manager_unittests', 'mojo_apps_js_unittests', @@ -149,10 +150,10 @@ '../base/base.gyp:base', '../base/base.gyp:base_static', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + 'edk/mojo_edk.gyp:mojo_system_impl', 'mojo_application_manager', 'mojo_base.gyp:mojo_application_chromium', 'mojo_base.gyp:mojo_common_lib', - 'mojo_base.gyp:mojo_system_impl', 'mojo_external_service_bindings', 'mojo_gles2_impl', 'mojo_network_bindings', @@ -227,7 +228,7 @@ 'target_name': 'mojo_shell_test_support', 'type': 'static_library', 'dependencies': [ - 'mojo_base.gyp:mojo_system_impl', + 'edk/mojo_edk.gyp:mojo_system_impl', 'mojo_shell_lib', ], 'sources': [ @@ -267,10 +268,10 @@ '../testing/gtest.gyp:gtest', '../net/net.gyp:net_test_support', '../url/url.gyp:url_lib', + 'edk/mojo_edk.gyp:mojo_system_impl', 'mojo_application_manager', 'mojo_base.gyp:mojo_common_lib', 'mojo_base.gyp:mojo_environment_chromium', - 'mojo_base.gyp:mojo_system_impl', 'mojo_shell_lib', 'mojo_test_app', 'mojo_test_request_tracker_app', @@ -334,11 +335,11 @@ '../base/base.gyp:base', '../testing/gtest.gyp:gtest', '../url/url.gyp:url_lib', + 'edk/mojo_edk.gyp:mojo_run_all_unittests', 'mojo_application_manager', - 'mojo_base.gyp:mojo_common_lib', 'mojo_base.gyp:mojo_application_chromium', + 'mojo_base.gyp:mojo_common_lib', 'mojo_base.gyp:mojo_environment_chromium', - 'mojo_base.gyp:mojo_run_all_unittests', 'public/mojo_public.gyp:mojo_cpp_bindings', ], 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], @@ -425,9 +426,9 @@ 'type': 'executable', 'dependencies': [ '../gin/gin.gyp:gin_test', - 'mojo_base.gyp:mojo_common_test_support', + 'edk/mojo_edk.gyp:mojo_common_test_support', + 'edk/mojo_edk.gyp:mojo_run_all_unittests', 'mojo_base.gyp:mojo_js_bindings_lib', - 'mojo_base.gyp:mojo_run_all_unittests', 'public/mojo_public.gyp:mojo_environment_standalone', 'public/mojo_public.gyp:mojo_public_test_interfaces', 'public/mojo_public.gyp:mojo_utility', @@ -503,10 +504,10 @@ '../testing/gtest.gyp:gtest', '../net/net.gyp:net_test_support', '../url/url.gyp:url_lib', + 'edk/mojo_edk.gyp:mojo_system_impl', 'mojo_application_manager', 'mojo_base.gyp:mojo_common_lib', 'mojo_base.gyp:mojo_environment_chromium', - 'mojo_base.gyp:mojo_system_impl', 'mojo_shell_lib', ], 'sources': [ @@ -643,7 +644,7 @@ 'python/system/mojo/embedder.pyx', ], 'dependencies': [ - 'mojo_base.gyp:mojo_system_impl', + 'edk/mojo_edk.gyp:mojo_system_impl', ], 'includes': [ '../third_party/cython/cython_compiler.gypi' ], }, |