| Index: chrome/chrome.gyp
|
| ===================================================================
|
| --- chrome/chrome.gyp (revision 18404)
|
| +++ chrome/chrome.gyp (working copy)
|
| @@ -3654,12 +3654,12 @@
|
| 'type': 'executable',
|
| 'msvs_guid': 'A34770EA-A574-43E8-9327-F79C04770E98',
|
| 'dependencies': [
|
| + 'app',
|
| 'test_support_common',
|
| 'test_support_ui',
|
| 'theme_resources',
|
| '../skia/skia.gyp:skia',
|
| '../testing/gtest.gyp:gtest',
|
| - 'app',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| @@ -3675,6 +3675,32 @@
|
| }],
|
| ],
|
| },
|
| + {
|
| + 'target_name': 'memory_test',
|
| + 'type': 'executable',
|
| + 'msvs_guid': 'A5F831FD-9B9C-4FEF-9FBA-554817B734CE',
|
| + 'dependencies': [
|
| + 'app',
|
| + 'test_support_common',
|
| + 'test_support_ui',
|
| + 'theme_resources',
|
| + '../skia/skia.gyp:skia',
|
| + '../testing/gtest.gyp:gtest',
|
| + ],
|
| + 'include_dirs': [
|
| + '..',
|
| + ],
|
| + 'sources': [
|
| + 'test/memory_test/memory_test.cc',
|
| + ],
|
| + 'conditions': [
|
| + ['OS=="linux"', {
|
| + 'dependencies': [
|
| + '../build/linux/system.gyp:gtk',
|
| + ],
|
| + }],
|
| + ],
|
| + },
|
| ],
|
| 'conditions': [
|
| # We set feature variables so the different parts that need to check for
|
| @@ -4392,24 +4418,6 @@
|
| },
|
| },
|
| {
|
| - 'target_name': 'memory_test',
|
| - 'type': 'executable',
|
| - 'msvs_guid': 'A5F831FD-9B9C-4FEF-9FBA-554817B734CE',
|
| - 'dependencies': [
|
| - 'test_support_common',
|
| - 'test_support_ui',
|
| - 'theme_resources',
|
| - '../skia/skia.gyp:skia',
|
| - '../testing/gtest.gyp:gtest',
|
| - ],
|
| - 'include_dirs': [
|
| - '..',
|
| - ],
|
| - 'sources': [
|
| - 'test/memory_test/memory_test.cc',
|
| - ],
|
| - },
|
| - {
|
| 'target_name': 'plugin_tests',
|
| 'type': 'executable',
|
| 'msvs_guid': 'A1CAA831-C507-4B2E-87F3-AEC63C9907F9',
|
|
|