| Index: mojo/mojo_apps.gypi
|
| diff --git a/mojo/mojo_apps.gypi b/mojo/mojo_apps.gypi
|
| index 8460979f752d4a4ba08de94b6ea4bbfeea2e39d6..934964f0bf4e0a56ef717a314086007ce4689f92 100644
|
| --- a/mojo/mojo_apps.gypi
|
| +++ b/mojo/mojo_apps.gypi
|
| @@ -8,17 +8,17 @@
|
| '../gin/gin.gyp:gin',
|
| '../ui/gl/gl.gyp:gl',
|
| '../v8/tools/gyp/v8.gyp:v8',
|
| - 'mojo_common_lib',
|
| - 'mojo_environment_chromium',
|
| + 'mojo_base.gyp:mojo_common_lib',
|
| + 'mojo_base.gyp:mojo_environment_chromium',
|
| + 'mojo_base.gyp:mojo_js_bindings_lib',
|
| 'mojo_gles2',
|
| 'mojo_gles2_bindings',
|
| - 'mojo_js_bindings_lib',
|
| 'mojo_native_viewport_bindings',
|
| ],
|
| 'export_dependent_settings': [
|
| '../base/base.gyp:base',
|
| '../gin/gin.gyp:gin',
|
| - 'mojo_common_lib',
|
| + 'mojo_base.gyp:mojo_common_lib',
|
| 'mojo_gles2',
|
| 'mojo_gles2_bindings',
|
| 'mojo_native_viewport_bindings',
|
| @@ -44,10 +44,10 @@
|
| ],
|
| 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
|
| 'export_dependent_settings': [
|
| - 'mojo_cpp_bindings',
|
| + 'mojo_base.gyp:mojo_cpp_bindings',
|
| ],
|
| 'dependencies': [
|
| - 'mojo_cpp_bindings',
|
| + 'mojo_base.gyp:mojo_cpp_bindings',
|
| ],
|
| },
|
| {
|
| @@ -55,12 +55,12 @@
|
| '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_common_lib',
|
| - 'mojo_common_test_support',
|
| 'mojo_js_lib',
|
| - 'mojo_run_all_unittests',
|
| - 'mojo_public_test_interfaces',
|
| ],
|
| 'sources': [
|
| 'apps/js/test/js_to_cpp_unittest.cc',
|
|
|