summaryrefslogtreecommitdiffstats
path: root/content/content_tests.gypi
diff options
context:
space:
mode:
authormorrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-30 22:54:06 +0000
committermorrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-30 22:54:06 +0000
commit7e77c0dbb65c9aa81b649e127bf4a41c86d38f9e (patch)
tree2e48b2fddf83a4cb40028e245abbe37b2c48493a /content/content_tests.gypi
parent9e617617348174d1a7c48a8b2cda1fabf33ea5c4 (diff)
downloadchromium_src-7e77c0dbb65c9aa81b649e127bf4a41c86d38f9e.zip
chromium_src-7e77c0dbb65c9aa81b649e127bf4a41c86d38f9e.tar.gz
chromium_src-7e77c0dbb65c9aa81b649e127bf4a41c86d38f9e.tar.bz2
Extract mojo_base.gyp from mojo.gyp
This change extract essential part of Mojo, which is needed to build chrome and its submodules, to mojo_base.gyp. Other chrome submodules can safely depends on mojo_base.gyp without worrying about excessive dependencies behind. Caveat: mojo_service_manager stays on mojo.gyp even though it is required to build chrome. This change leaves it as it depends on net.gyp, which has non trivial dependencies. BUG=397672 TEST=none R=jamesr@chromium.org, viettrungluu@chromium.org, rockot@chromium.org TBR=darin@chromium.org Review URL: https://codereview.chromium.org/422163004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286627 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_tests.gypi')
-rw-r--r--content/content_tests.gypi14
1 files changed, 7 insertions, 7 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 8e0689f..f5712e8 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1041,14 +1041,14 @@
'target_name': 'web_ui_test_mojo_bindings',
'type': 'static_library',
'dependencies': [
- '../mojo/mojo.gyp:mojo_cpp_bindings',
+ '../mojo/mojo_base.gyp:mojo_cpp_bindings',
],
'sources': [
'test/data/web_ui_test_mojo_bindings.mojom',
],
'includes': [ '../mojo/public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- '../mojo/mojo.gyp:mojo_cpp_bindings',
+ '../mojo/mojo_base.gyp:mojo_cpp_bindings',
],
},
{
@@ -1071,12 +1071,12 @@
'../ipc/ipc.gyp:test_support_ipc',
'../media/media.gyp:media_test_support',
'../media/media.gyp:shared_memory_support',
- '../mojo/mojo.gyp:mojo_common_test_support',
- '../mojo/mojo.gyp:mojo_cpp_bindings',
- '../mojo/mojo.gyp:mojo_environment_chromium',
- '../mojo/mojo.gyp:mojo_js_bindings',
+ '../mojo/mojo_base.gyp:mojo_common_test_support',
+ '../mojo/mojo_base.gyp:mojo_cpp_bindings',
+ '../mojo/mojo_base.gyp:mojo_environment_chromium',
+ '../mojo/mojo_base.gyp:mojo_js_bindings',
+ '../mojo/mojo_base.gyp:mojo_system_impl',
'../mojo/mojo.gyp:mojo_service_manager',
- '../mojo/mojo.gyp:mojo_system_impl',
'../net/net.gyp:net_test_support',
'../ppapi/ppapi_internal.gyp:ppapi_host',
'../ppapi/ppapi_internal.gyp:ppapi_ipc',