projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
mojo
/
mojo_apps.gypi
diff --git
a/src/mojo/mojo_apps.gypi
b/src/mojo/mojo_apps.gypi
index
5e1d2ca
..
fda9084
100644
(file)
--- a/
src/mojo/mojo_apps.gypi
+++ b/
src/mojo/mojo_apps.gypi
@@
-1,3
+1,7
@@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
{
'targets': [
{
{
'targets': [
{
@@
-8,20
+12,20
@@
'../gin/gin.gyp:gin',
'../ui/gl/gl.gyp:gl',
'../v8/tools/gyp/v8.gyp:v8',
'../gin/gin.gyp:gin',
'../ui/gl/gl.gyp:gl',
'../v8/tools/gyp/v8.gyp:v8',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
- 'mojo_gles2',
- 'mojo_gles2_bindings',
- 'mojo_js_bindings_lib',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_gles2_bindings',
+ 'mojo_base.gyp:mojo_js_bindings_lib',
'mojo_native_viewport_bindings',
'mojo_native_viewport_bindings',
+ '<(mojo_gles2_for_loadable_module)',
],
'export_dependent_settings': [
'../base/base.gyp:base',
'../gin/gin.gyp:gin',
],
'export_dependent_settings': [
'../base/base.gyp:base',
'../gin/gin.gyp:gin',
- 'mojo_common_lib',
- 'mojo_gles2',
- 'mojo_gles2_bindings',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_gles2_bindings',
'mojo_native_viewport_bindings',
'mojo_native_viewport_bindings',
+ '<(mojo_gles2_for_loadable_module)',
],
'sources': [
'apps/js/mojo_runner_delegate.cc',
],
'sources': [
'apps/js/mojo_runner_delegate.cc',
@@
-44,10
+48,10
@@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_
base.gyp:mojo_
cpp_bindings',
],
'dependencies': [
],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_
base.gyp:mojo_
cpp_bindings',
],
},
{
],
},
{
@@
-55,12
+59,12
@@
'type': 'executable',
'dependencies': [
'../gin/gin.gyp:gin_test',
'type': 'executable',
'dependencies': [
'../gin/gin.gyp:gin_test',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_common_test_support',
+ 'mojo_base.gyp:mojo_public_test_interfaces',
+ 'mojo_base.gyp:mojo_run_all_unittests',
'mojo_apps_js_bindings',
'mojo_apps_js_bindings',
- 'mojo_common_lib',
- 'mojo_common_test_support',
'mojo_js_lib',
'mojo_js_lib',
- 'mojo_run_all_unittests',
- 'mojo_public_test_interfaces',
],
'sources': [
'apps/js/test/js_to_cpp_unittest.cc',
],
'sources': [
'apps/js/test/js_to_cpp_unittest.cc',
@@
-69,10
+73,10
@@
},
{
'target_name': 'mojo_js',
},
{
'target_name': 'mojo_js',
- 'type': '
shared_library
',
+ 'type': '
loadable_module
',
'dependencies': [
'mojo_js_lib',
'dependencies': [
'mojo_js_lib',
- '
mojo_system_impl
',
+ '
<(mojo_system_for_loadable_module)
',
],
'sources': [
'apps/js/main.cc',
],
'sources': [
'apps/js/main.cc',