summaryrefslogtreecommitdiffstats
path: root/mojo/mojo.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'mojo/mojo.gyp')
-rw-r--r--mojo/mojo.gyp23
1 files changed, 2 insertions, 21 deletions
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 7cb5bec..1f0f013 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -7,6 +7,7 @@
'chromium_code': 1,
},
'includes': [
+ 'mojo_apps.gypi',
'mojo_examples.gypi',
'mojo_public.gypi',
'mojo_services.gypi',
@@ -22,8 +23,7 @@
'mojo_common_lib',
'mojo_common_unittests',
'mojo_js',
- 'mojo_js_bindings',
- 'mojo_js_bindings_unittests',
+ 'mojo_js_unittests',
'mojo_public_perftests',
'mojo_public_test_support',
'mojo_public_unittests',
@@ -262,25 +262,6 @@
}],
],
},
- {
- 'target_name': 'mojo_js',
- 'type': 'shared_library',
- 'dependencies': [
- '../base/base.gyp:base',
- '../gin/gin.gyp:gin',
- 'hello_world_service',
- 'mojo_common_lib',
- 'mojo_js_bindings',
- 'mojo_system',
- ],
- 'sources': [
- 'apps/js/main.cc',
- 'apps/js/mojo_runner_delegate.cc',
- 'apps/js/mojo_runner_delegate.h',
- 'apps/js/threading.cc',
- 'apps/js/threading.h',
- ],
- },
],
'conditions': [
['OS=="android"', {