summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-20 20:44:59 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-20 20:44:59 +0000
commit09d040f5bfb297958dd7b0769846ab030fd0c9ab (patch)
tree97cbf06c0bc9df49b77a4017f55d8363ea0a99fc /mojo
parente6097b43c43d945b5159b57507637bd63ca42bb5 (diff)
downloadchromium_src-09d040f5bfb297958dd7b0769846ab030fd0c9ab.zip
chromium_src-09d040f5bfb297958dd7b0769846ab030fd0c9ab.tar.gz
chromium_src-09d040f5bfb297958dd7b0769846ab030fd0c9ab.tar.bz2
Remove direct dependency of mojo_shell_lib on mojo_native_viewport_service
BUG=None R=abarth@chromium.org Review URL: https://codereview.chromium.org/120083002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242171 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo')
-rw-r--r--mojo/mojo.gyp10
1 files changed, 4 insertions, 6 deletions
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 12a552b..7fabf14 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -249,9 +249,7 @@
'../base/base.gyp:base',
'../net/net.gyp:net',
'../url/url.gyp:url_lib',
- 'mojo_bindings',
'mojo_gles2_impl',
- 'mojo_native_viewport_service',
'mojo_shell_bindings',
'mojo_system',
'mojo_system_impl',
@@ -267,10 +265,10 @@
'shell/network_delegate.h',
'shell/run.cc',
'shell/run.h',
- 'shell/storage.cc',
- 'shell/storage.h',
'shell/service_manager.cc',
'shell/service_manager.h',
+ 'shell/storage.cc',
+ 'shell/storage.h',
'shell/switches.cc',
'shell/switches.h',
'shell/task_runners.cc',
@@ -373,9 +371,9 @@
'../ui/gl/gl.gyp:gl',
'mojo_common_lib',
'mojo_jni_headers',
- 'mojo_shell_lib',
- 'mojo_shell_bindings',
'mojo_native_viewport_service',
+ 'mojo_shell_bindings',
+ 'mojo_shell_lib',
],
'sources': [
'shell/android/library_loader.cc',