| OLD | NEW | 
|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 { | 5 { | 
| 6   'targets': [ | 6   'targets': [ | 
| 7     { | 7     { | 
| 8       # GN version: //mojo/apps/js | 8       # GN version: //mojo/apps/js | 
| 9       #             //mojo/apps/js/bindings | 9       #             //mojo/apps/js/bindings | 
| 10       #             //mojo/apps/js/bindings/gl | 10       #             //mojo/apps/js/bindings/gl | 
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 73         'mojo_apps_js_bindings', | 73         'mojo_apps_js_bindings', | 
| 74         'mojo_js_lib', | 74         'mojo_js_lib', | 
| 75       ], | 75       ], | 
| 76       'sources': [ | 76       'sources': [ | 
| 77         'apps/js/test/handle_unittest.cc', | 77         'apps/js/test/handle_unittest.cc', | 
| 78         'apps/js/test/js_to_cpp_unittest.cc', | 78         'apps/js/test/js_to_cpp_unittest.cc', | 
| 79         'apps/js/test/run_apps_js_tests.cc', | 79         'apps/js/test/run_apps_js_tests.cc', | 
| 80       ], | 80       ], | 
| 81     }, | 81     }, | 
| 82     { | 82     { | 
| 83       # GN version: //mojo/apps/js:mojo_js | 83       # GN version: //mojo/apps/js/test:mojo_js_apps_lib | 
| 84       'target_name': 'mojo_js', | 84       'target_name': 'mojo_js_apps_lib', | 
| 85       'type': 'loadable_module', | 85       'type': 'static_library', | 
|  | 86       'export_dependent_settings': [ | 
|  | 87         'mojo_base.gyp:mojo_cpp_bindings', | 
|  | 88       ], | 
| 86       'dependencies': [ | 89       'dependencies': [ | 
| 87         'mojo_base.gyp:mojo_application_chromium', | 90         'mojo_base.gyp:mojo_application_chromium', | 
|  | 91         'mojo_apps_js_bindings', | 
| 88         'mojo_base.gyp:mojo_cpp_bindings', | 92         'mojo_base.gyp:mojo_cpp_bindings', | 
| 89         'mojo_base.gyp:mojo_utility', | 93         'mojo_base.gyp:mojo_utility', | 
| 90         'mojo_content_handler_bindings', |  | 
| 91         'mojo_js_lib', | 94         'mojo_js_lib', | 
| 92         '<(mojo_system_for_loadable_module)', |  | 
| 93       ], | 95       ], | 
| 94       'sources': [ | 96       'sources': [ | 
| 95         'apps/js/application_delegate_impl.cc', | 97         'apps/js/application_delegate_impl.cc', | 
| 96         'apps/js/js_app.cc', | 98         'apps/js/js_app.cc', | 
| 97         'apps/js/mojo_module.cc', | 99         'apps/js/mojo_module.cc', | 
| 98         'apps/js/main.cc', | 100       ], | 
|  | 101     }, | 
|  | 102     { | 
|  | 103       # GN version: //mojo/apps/js:mojo_js_content_handler | 
|  | 104       'target_name': 'mojo_js_content_handler', | 
|  | 105       'type': 'loadable_module', | 
|  | 106       'dependencies': [ | 
|  | 107         'mojo_content_handler_bindings', | 
|  | 108         'mojo_js_apps_lib', | 
|  | 109         '<(mojo_system_for_loadable_module)', | 
|  | 110       ], | 
|  | 111       'sources': [ | 
|  | 112         'apps/js/content_handler_impl.cc', | 
|  | 113         'apps/js/content_handler_main.cc', | 
|  | 114       ], | 
|  | 115     }, | 
|  | 116     { | 
|  | 117       # GN version: //mojo/apps/js:mojo_js_standalone | 
|  | 118       'target_name': 'mojo_js_standalone', | 
|  | 119       'type': 'loadable_module', | 
|  | 120       'dependencies': [ | 
|  | 121         'mojo_js_apps_lib', | 
|  | 122         '<(mojo_system_for_loadable_module)', | 
|  | 123       ], | 
|  | 124       'sources': [ | 
|  | 125         'apps/js/standalone_main.cc', | 
| 99       ], | 126       ], | 
| 100     }, | 127     }, | 
| 101   ], | 128   ], | 
| 102   'conditions': [ | 129   'conditions': [ | 
| 103     ['test_isolation_mode != "noop"', { | 130     ['test_isolation_mode != "noop"', { | 
| 104       'targets': [ | 131       'targets': [ | 
| 105         { | 132         { | 
| 106           'target_name': 'mojo_apps_js_unittests_run', | 133           'target_name': 'mojo_apps_js_unittests_run', | 
| 107           'type': 'none', | 134           'type': 'none', | 
| 108           'dependencies': [ | 135           'dependencies': [ | 
| 109             'mojo_apps_js_unittests', | 136             'mojo_apps_js_unittests', | 
| 110           ], | 137           ], | 
| 111           'includes': [ | 138           'includes': [ | 
| 112             '../build/isolate.gypi', | 139             '../build/isolate.gypi', | 
| 113           ], | 140           ], | 
| 114           'sources': [ | 141           'sources': [ | 
| 115             'mojo_apps_js_unittests.isolate', | 142             'mojo_apps_js_unittests.isolate', | 
| 116           ], | 143           ], | 
| 117         }, | 144         }, | 
| 118       ], | 145       ], | 
| 119     }], | 146     }], | 
| 120   ], | 147   ], | 
| 121 } | 148 } | 
| OLD | NEW | 
|---|