| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 'target_name': 'test_support_content', | 8 'target_name': 'test_support_content', |
| 9 'type': 'static_library', | 9 'type': 'static_library', |
| 10 'dependencies': [ | 10 'dependencies': [ |
| (...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 943 '../mojo/mojo.gyp:mojo_system', | 943 '../mojo/mojo.gyp:mojo_system', |
| 944 ], | 944 ], |
| 945 'sources': [ | 945 'sources': [ |
| 946 'test/data/web_ui_test_mojo_bindings.mojom', | 946 'test/data/web_ui_test_mojo_bindings.mojom', |
| 947 ], | 947 ], |
| 948 # TODO(sky): this shouldn't be necessary. It's working around a bug in | 948 # TODO(sky): this shouldn't be necessary. It's working around a bug in |
| 949 # gyp. | 949 # gyp. |
| 950 'variables': { | 950 'variables': { |
| 951 'mojom_base_output_dir': 'content', | 951 'mojom_base_output_dir': 'content', |
| 952 }, | 952 }, |
| 953 'includes': [ '../mojo/public/bindings/mojom_bindings_generator.gypi'
], | 953 'includes': [ '../mojo/public/tools/bindings/mojom_bindings_generator.
gypi' ], |
| 954 'export_dependent_settings': [ | 954 'export_dependent_settings': [ |
| 955 '../mojo/mojo.gyp:mojo_bindings', | 955 '../mojo/mojo.gyp:mojo_bindings', |
| 956 '../mojo/mojo.gyp:mojo_system', | 956 '../mojo/mojo.gyp:mojo_system', |
| 957 ], | 957 ], |
| 958 }, | 958 }, |
| 959 { | 959 { |
| 960 'target_name': 'content_browsertests', | 960 'target_name': 'content_browsertests', |
| 961 'type': '<(gtest_target_type)', | 961 'type': '<(gtest_target_type)', |
| 962 'dependencies': [ | 962 'dependencies': [ |
| 963 'content.gyp:content_common', | 963 'content.gyp:content_common', |
| (...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1785 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], | 1785 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], |
| 1786 }, | 1786 }, |
| 1787 ], | 1787 ], |
| 1788 }], | 1788 }], |
| 1789 ], | 1789 ], |
| 1790 }, | 1790 }, |
| 1791 ], | 1791 ], |
| 1792 }], | 1792 }], |
| 1793 ], | 1793 ], |
| 1794 } | 1794 } |
| OLD | NEW |