summaryrefslogtreecommitdiffstats
path: root/mojo/mojo_apps.gypi
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-15 03:14:25 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-15 03:14:25 +0000
commit3a73473578cabeda52d8573ca2f07bfced69c003 (patch)
tree1f983e43fca3dc3cbeb89097392a9844abcdbaaa /mojo/mojo_apps.gypi
parent6916f5a8409a4b7acbbd8df297bbb96846f63743 (diff)
downloadchromium_src-3a73473578cabeda52d8573ca2f07bfced69c003.zip
chromium_src-3a73473578cabeda52d8573ca2f07bfced69c003.tar.gz
chromium_src-3a73473578cabeda52d8573ca2f07bfced69c003.tar.bz2
Make mojo_system static and mojo_system_impl a component, never use both
Try #2, after https://codereview.chromium.org/231353002/ broke build. BUG= TBR=vtl Review URL: https://codereview.chromium.org/237763002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/mojo_apps.gypi')
-rw-r--r--mojo/mojo_apps.gypi3
1 files changed, 1 insertions, 2 deletions
diff --git a/mojo/mojo_apps.gypi b/mojo/mojo_apps.gypi
index 934d36a..62d904d 100644
--- a/mojo/mojo_apps.gypi
+++ b/mojo/mojo_apps.gypi
@@ -14,7 +14,6 @@
'mojo_gles2_bindings',
'mojo_js_bindings_lib',
'mojo_native_viewport_bindings',
- 'mojo_system',
],
'export_dependent_settings': [
'../base/base.gyp:base',
@@ -23,7 +22,6 @@
'mojo_gles2',
'mojo_gles2_bindings',
'mojo_native_viewport_bindings',
- 'mojo_system',
],
'sources': [
'apps/js/mojo_runner_delegate.cc',
@@ -56,6 +54,7 @@
'type': 'shared_library',
'dependencies': [
'mojo_js_lib',
+ 'mojo_system_impl',
],
'sources': [
'apps/js/main.cc',