| 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_common_lib', |
| 12 'mojo_environment_chromium', | 12 'mojo_environment_chromium', |
| 13 'mojo_gles2', | 13 'mojo_gles2', |
| 14 'mojo_gles2_bindings', | 14 'mojo_gles2_bindings', |
| 15 'mojo_js_bindings_lib', |
| 15 'mojo_native_viewport_bindings', | 16 'mojo_native_viewport_bindings', |
| 16 'mojo_system', | 17 'mojo_system', |
| 17 ], | 18 ], |
| 18 'export_dependent_settings': [ | 19 'export_dependent_settings': [ |
| 19 '../base/base.gyp:base', | 20 '../base/base.gyp:base', |
| 20 '../gin/gin.gyp:gin', | 21 '../gin/gin.gyp:gin', |
| 21 'mojo_common_lib', | 22 'mojo_common_lib', |
| 22 'mojo_gles2', | 23 'mojo_gles2', |
| 23 'mojo_gles2_bindings', | 24 'mojo_gles2_bindings', |
| 24 'mojo_native_viewport_bindings', | 25 'mojo_native_viewport_bindings', |
| 25 'mojo_system', | 26 'mojo_system', |
| 26 ], | 27 ], |
| 27 'sources': [ | 28 'sources': [ |
| 28 'apps/js/mojo_runner_delegate.cc', | 29 'apps/js/mojo_runner_delegate.cc', |
| 29 'apps/js/mojo_runner_delegate.h', | 30 'apps/js/mojo_runner_delegate.h', |
| 30 'apps/js/bindings/threading.cc', | 31 'apps/js/bindings/threading.cc', |
| 31 'apps/js/bindings/threading.h', | 32 'apps/js/bindings/threading.h', |
| 32 'apps/js/bindings/core.cc', | |
| 33 'apps/js/bindings/core.h', | |
| 34 'apps/js/bindings/gl/context.cc', | 33 'apps/js/bindings/gl/context.cc', |
| 35 'apps/js/bindings/gl/context.h', | 34 'apps/js/bindings/gl/context.h', |
| 36 'apps/js/bindings/gl/module.cc', | 35 'apps/js/bindings/gl/module.cc', |
| 37 'apps/js/bindings/gl/module.h', | 36 'apps/js/bindings/gl/module.h', |
| 38 'apps/js/bindings/handle.cc', | |
| 39 'apps/js/bindings/handle.h', | |
| 40 'apps/js/bindings/monotonic_clock.cc', | 37 'apps/js/bindings/monotonic_clock.cc', |
| 41 'apps/js/bindings/monotonic_clock.h', | 38 'apps/js/bindings/monotonic_clock.h', |
| 42 'apps/js/bindings/support.cc', | |
| 43 'apps/js/bindings/support.h', | |
| 44 'apps/js/bindings/waiting_callback.cc', | |
| 45 'apps/js/bindings/waiting_callback.h', | |
| 46 ], | 39 ], |
| 47 }, | 40 }, |
| 48 { | 41 { |
| 49 'target_name': 'mojo_js_unittests', | 42 'target_name': 'mojo_js_unittests', |
| 50 'type': 'executable', | 43 'type': 'executable', |
| 51 'dependencies': [ | 44 'dependencies': [ |
| 52 '../gin/gin.gyp:gin_test', | 45 '../gin/gin.gyp:gin_test', |
| 53 'mojo_js_lib', | 46 'mojo_js_lib', |
| 54 'mojo_run_all_unittests', | 47 'mojo_run_all_unittests', |
| 55 'mojo_sample_service', | 48 'mojo_sample_service', |
| 56 ], | 49 ], |
| 57 'sources': [ | 50 'sources': [ |
| 58 'apps/js/test/run_js_tests.cc', | 51 'apps/js/test/run_js_tests.cc', |
| 59 ], | 52 ], |
| 60 }, | 53 }, |
| 61 { | 54 { |
| 62 'target_name': 'mojo_js', | 55 'target_name': 'mojo_js', |
| 63 'type': 'shared_library', | 56 'type': 'shared_library', |
| 64 'dependencies': [ | 57 'dependencies': [ |
| 65 'mojo_js_lib', | 58 'mojo_js_lib', |
| 66 ], | 59 ], |
| 67 'sources': [ | 60 'sources': [ |
| 68 'apps/js/main.cc', | 61 'apps/js/main.cc', |
| 69 ], | 62 ], |
| 70 }, | 63 }, |
| 71 ], | 64 ], |
| 72 } | 65 } |
| OLD | NEW |