| OLD | NEW |
| 1 { | 1 { |
| 2 'targets': [ | 2 'targets': [ |
| 3 { | 3 { |
| 4 'target_name': 'mojo_js_lib', | 4 'target_name': 'mojo_js_lib', |
| 5 'type': 'static_library', | 5 'type': 'static_library', |
| 6 'dependencies': [ | 6 'dependencies': [ |
| 7 '../base/base.gyp:base', | 7 '../base/base.gyp:base', |
| 8 '../gin/gin.gyp:gin', | 8 '../gin/gin.gyp:gin', |
| 9 '../ui/gl/gl.gyp:gl', | 9 '../ui/gl/gl.gyp:gl', |
| 10 '../v8/tools/gyp/v8.gyp:v8', | 10 '../v8/tools/gyp/v8.gyp:v8', |
| 11 'mojo_common_lib', | 11 'mojo_base.gyp:mojo_common_lib', |
| 12 'mojo_environment_chromium', | 12 'mojo_base.gyp:mojo_environment_chromium', |
| 13 'mojo_base.gyp:mojo_js_bindings_lib', |
| 13 'mojo_gles2', | 14 'mojo_gles2', |
| 14 'mojo_gles2_bindings', | 15 'mojo_gles2_bindings', |
| 15 'mojo_js_bindings_lib', | |
| 16 'mojo_native_viewport_bindings', | 16 'mojo_native_viewport_bindings', |
| 17 ], | 17 ], |
| 18 'export_dependent_settings': [ | 18 'export_dependent_settings': [ |
| 19 '../base/base.gyp:base', | 19 '../base/base.gyp:base', |
| 20 '../gin/gin.gyp:gin', | 20 '../gin/gin.gyp:gin', |
| 21 'mojo_common_lib', | 21 'mojo_base.gyp:mojo_common_lib', |
| 22 'mojo_gles2', | 22 'mojo_gles2', |
| 23 'mojo_gles2_bindings', | 23 'mojo_gles2_bindings', |
| 24 'mojo_native_viewport_bindings', | 24 'mojo_native_viewport_bindings', |
| 25 ], | 25 ], |
| 26 'sources': [ | 26 'sources': [ |
| 27 'apps/js/mojo_runner_delegate.cc', | 27 'apps/js/mojo_runner_delegate.cc', |
| 28 'apps/js/mojo_runner_delegate.h', | 28 'apps/js/mojo_runner_delegate.h', |
| 29 'apps/js/bindings/threading.cc', | 29 'apps/js/bindings/threading.cc', |
| 30 'apps/js/bindings/threading.h', | 30 'apps/js/bindings/threading.h', |
| 31 'apps/js/bindings/gl/context.cc', | 31 'apps/js/bindings/gl/context.cc', |
| 32 'apps/js/bindings/gl/context.h', | 32 'apps/js/bindings/gl/context.h', |
| 33 'apps/js/bindings/gl/module.cc', | 33 'apps/js/bindings/gl/module.cc', |
| 34 'apps/js/bindings/gl/module.h', | 34 'apps/js/bindings/gl/module.h', |
| 35 'apps/js/bindings/monotonic_clock.cc', | 35 'apps/js/bindings/monotonic_clock.cc', |
| 36 'apps/js/bindings/monotonic_clock.h', | 36 'apps/js/bindings/monotonic_clock.h', |
| 37 ], | 37 ], |
| 38 }, | 38 }, |
| 39 { | 39 { |
| 40 'target_name': 'mojo_apps_js_bindings', | 40 'target_name': 'mojo_apps_js_bindings', |
| 41 'type': 'static_library', | 41 'type': 'static_library', |
| 42 'sources': [ | 42 'sources': [ |
| 43 'apps/js/test/js_to_cpp.mojom', | 43 'apps/js/test/js_to_cpp.mojom', |
| 44 ], | 44 ], |
| 45 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], | 45 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], |
| 46 'export_dependent_settings': [ | 46 'export_dependent_settings': [ |
| 47 'mojo_cpp_bindings', | 47 'mojo_base.gyp:mojo_cpp_bindings', |
| 48 ], | 48 ], |
| 49 'dependencies': [ | 49 'dependencies': [ |
| 50 'mojo_cpp_bindings', | 50 'mojo_base.gyp:mojo_cpp_bindings', |
| 51 ], | 51 ], |
| 52 }, | 52 }, |
| 53 { | 53 { |
| 54 'target_name': 'mojo_apps_js_unittests', | 54 'target_name': 'mojo_apps_js_unittests', |
| 55 'type': 'executable', | 55 'type': 'executable', |
| 56 'dependencies': [ | 56 'dependencies': [ |
| 57 '../gin/gin.gyp:gin_test', | 57 '../gin/gin.gyp:gin_test', |
| 58 'mojo_base.gyp:mojo_common_lib', |
| 59 'mojo_base.gyp:mojo_common_test_support', |
| 60 'mojo_base.gyp:mojo_run_all_unittests', |
| 61 'mojo_base.gyp:mojo_public_test_interfaces', |
| 58 'mojo_apps_js_bindings', | 62 'mojo_apps_js_bindings', |
| 59 'mojo_common_lib', | |
| 60 'mojo_common_test_support', | |
| 61 'mojo_js_lib', | 63 'mojo_js_lib', |
| 62 'mojo_run_all_unittests', | |
| 63 'mojo_public_test_interfaces', | |
| 64 ], | 64 ], |
| 65 'sources': [ | 65 'sources': [ |
| 66 'apps/js/test/js_to_cpp_unittest.cc', | 66 'apps/js/test/js_to_cpp_unittest.cc', |
| 67 'apps/js/test/run_apps_js_tests.cc', | 67 'apps/js/test/run_apps_js_tests.cc', |
| 68 ], | 68 ], |
| 69 }, | 69 }, |
| 70 { | 70 { |
| 71 'target_name': 'mojo_js', | 71 'target_name': 'mojo_js', |
| 72 'type': 'loadable_module', | 72 'type': 'loadable_module', |
| 73 'dependencies': [ | 73 'dependencies': [ |
| (...skipping 19 matching lines...) Expand all Loading... |
| 93 'mojo_apps_js_unittests.isolate', | 93 'mojo_apps_js_unittests.isolate', |
| 94 ], | 94 ], |
| 95 'sources': [ | 95 'sources': [ |
| 96 'mojo_apps_js_unittests.isolate', | 96 'mojo_apps_js_unittests.isolate', |
| 97 ], | 97 ], |
| 98 }, | 98 }, |
| 99 ], | 99 ], |
| 100 }], | 100 }], |
| 101 ], | 101 ], |
| 102 } | 102 } |
| OLD | NEW |