| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 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 'variables' : { | 5 'variables' : { |
| 6 'pyautolib_sources': [ | 6 'pyautolib_sources': [ |
| 7 'app/chrome_command_ids.h', | 7 'app/chrome_command_ids.h', |
| 8 'app/chrome_dll_resource.h', | 8 'app/chrome_dll_resource.h', |
| 9 'common/automation_constants.h', | 9 'common/automation_constants.h', |
| 10 'common/pref_names.cc', | 10 'common/pref_names.cc', |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 'debugger', | 146 'debugger', |
| 147 'renderer', | 147 'renderer', |
| 148 'test_support_common', | 148 'test_support_common', |
| 149 # NOTE: don't add test_support_ui, no more UITests. See | 149 # NOTE: don't add test_support_ui, no more UITests. See |
| 150 # http://crbug.com/137365 | 150 # http://crbug.com/137365 |
| 151 '../third_party/hunspell/hunspell.gyp:hunspell', | 151 '../third_party/hunspell/hunspell.gyp:hunspell', |
| 152 '../net/net.gyp:net', | 152 '../net/net.gyp:net', |
| 153 '../net/net.gyp:net_resources', | 153 '../net/net.gyp:net_resources', |
| 154 '../net/net.gyp:net_test_support', | 154 '../net/net.gyp:net_test_support', |
| 155 '../skia/skia.gyp:skia', | 155 '../skia/skia.gyp:skia', |
| 156 '../sync/protocol/sync_proto.gyp:sync_proto', | 156 '../sync/sync.gyp:sync', |
| 157 '../sync/sync.gyp:sync_api', | |
| 158 '../third_party/icu/icu.gyp:icui18n', | 157 '../third_party/icu/icu.gyp:icui18n', |
| 159 '../third_party/icu/icu.gyp:icuuc', | 158 '../third_party/icu/icu.gyp:icuuc', |
| 160 '../third_party/libpng/libpng.gyp:libpng', | 159 '../third_party/libpng/libpng.gyp:libpng', |
| 161 '../third_party/zlib/zlib.gyp:zlib', | 160 '../third_party/zlib/zlib.gyp:zlib', |
| 162 '../testing/gmock.gyp:gmock', | 161 '../testing/gmock.gyp:gmock', |
| 163 '../testing/gtest.gyp:gtest', | 162 '../testing/gtest.gyp:gtest', |
| 164 '../third_party/npapi/npapi.gyp:npapi', | 163 '../third_party/npapi/npapi.gyp:npapi', |
| 165 # Runtime dependencies | 164 # Runtime dependencies |
| 166 '../ppapi/ppapi_internal.gyp:ppapi_tests', | 165 '../ppapi/ppapi_internal.gyp:ppapi_tests', |
| 167 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', | 166 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 'chrome', | 454 'chrome', |
| 456 'chrome_resources.gyp:chrome_resources', | 455 'chrome_resources.gyp:chrome_resources', |
| 457 'chrome_resources.gyp:chrome_strings', | 456 'chrome_resources.gyp:chrome_strings', |
| 458 'chromedriver_support', | 457 'chromedriver_support', |
| 459 'common', | 458 'common', |
| 460 'test_support_ui', | 459 'test_support_ui', |
| 461 '../base/base.gyp:base', | 460 '../base/base.gyp:base', |
| 462 '../build/temp_gyp/googleurl.gyp:googleurl', | 461 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 463 '../net/net.gyp:net', | 462 '../net/net.gyp:net', |
| 464 '../skia/skia.gyp:skia', | 463 '../skia/skia.gyp:skia', |
| 465 '../sync/sync.gyp:sync_api', | 464 '../sync/sync.gyp:sync', |
| 466 '../testing/gtest.gyp:gtest', | 465 '../testing/gtest.gyp:gtest', |
| 467 '../third_party/icu/icu.gyp:icui18n', | 466 '../third_party/icu/icu.gyp:icui18n', |
| 468 '../third_party/icu/icu.gyp:icuuc', | 467 '../third_party/icu/icu.gyp:icuuc', |
| 469 '../third_party/libxml/libxml.gyp:libxml', | 468 '../third_party/libxml/libxml.gyp:libxml', |
| 470 ], | 469 ], |
| 471 'include_dirs': [ | 470 'include_dirs': [ |
| 472 '..', | 471 '..', |
| 473 ], | 472 ], |
| 474 'sources': [ | 473 'sources': [ |
| 475 'test/webdriver/commands/alert_commands.cc', | 474 'test/webdriver/commands/alert_commands.cc', |
| (...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 921 'common/extensions/api/api.gyp:api', | 920 'common/extensions/api/api.gyp:api', |
| 922 'renderer', | 921 'renderer', |
| 923 'test_support_common', | 922 'test_support_common', |
| 924 '../base/base.gyp:base', | 923 '../base/base.gyp:base', |
| 925 '../base/base.gyp:base_i18n', | 924 '../base/base.gyp:base_i18n', |
| 926 '../base/base.gyp:test_support_base', | 925 '../base/base.gyp:test_support_base', |
| 927 '../device/device.gyp:device_bluetooth_mocks', | 926 '../device/device.gyp:device_bluetooth_mocks', |
| 928 '../net/net.gyp:net', | 927 '../net/net.gyp:net', |
| 929 '../net/net.gyp:net_test_support', | 928 '../net/net.gyp:net_test_support', |
| 930 '../skia/skia.gyp:skia', | 929 '../skia/skia.gyp:skia', |
| 931 '../sync/protocol/sync_proto.gyp:sync_proto', | 930 '../sync/sync.gyp:sync', |
| 932 '../sync/sync.gyp:sync_notifier', | |
| 933 '../sync/sync.gyp:test_support_sync_api', | 931 '../sync/sync.gyp:test_support_sync_api', |
| 934 '../testing/gmock.gyp:gmock', | 932 '../testing/gmock.gyp:gmock', |
| 935 '../testing/gtest.gyp:gtest', | 933 '../testing/gtest.gyp:gtest', |
| 934 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio
n', |
| 936 '../third_party/cld/cld.gyp:cld', | 935 '../third_party/cld/cld.gyp:cld', |
| 937 '../third_party/icu/icu.gyp:icui18n', | 936 '../third_party/icu/icu.gyp:icui18n', |
| 938 '../third_party/icu/icu.gyp:icuuc', | 937 '../third_party/icu/icu.gyp:icuuc', |
| 939 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', | 938 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |
| 940 '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing', | 939 '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing', |
| 941 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', | 940 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', |
| 942 '../v8/tools/gyp/v8.gyp:v8', | 941 '../v8/tools/gyp/v8.gyp:v8', |
| 943 '../webkit/webkit.gyp:test_shell_test_support', | 942 '../webkit/webkit.gyp:test_shell_test_support', |
| 944 # Runtime dependencies | 943 # Runtime dependencies |
| 945 '../ppapi/ppapi_internal.gyp:ppapi_tests', | 944 '../ppapi/ppapi_internal.gyp:ppapi_tests', |
| (...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1761 ], # conditions | 1760 ], # conditions |
| 1762 }, # target browser_tests | 1761 }, # target browser_tests |
| 1763 { | 1762 { |
| 1764 # Executable that runs each perf browser test in a new process. | 1763 # Executable that runs each perf browser test in a new process. |
| 1765 'target_name': 'performance_browser_tests', | 1764 'target_name': 'performance_browser_tests', |
| 1766 'type': 'executable', | 1765 'type': 'executable', |
| 1767 'msvs_cygwin_shell': 0, | 1766 'msvs_cygwin_shell': 0, |
| 1768 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], | 1767 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], |
| 1769 'dependencies': [ | 1768 'dependencies': [ |
| 1770 'browser', | 1769 'browser', |
| 1771 '../sync/protocol/sync_proto.gyp:sync_proto', | |
| 1772 'chrome_resources.gyp:chrome_resources', | 1770 'chrome_resources.gyp:chrome_resources', |
| 1773 'chrome_resources.gyp:chrome_strings', | 1771 'chrome_resources.gyp:chrome_strings', |
| 1774 'chrome_resources.gyp:packed_extra_resources', | 1772 'chrome_resources.gyp:packed_extra_resources', |
| 1775 'chrome_resources.gyp:packed_resources', | 1773 'chrome_resources.gyp:packed_resources', |
| 1776 'renderer', | 1774 'renderer', |
| 1777 'test_support_common', | 1775 'test_support_common', |
| 1778 '../base/base.gyp:base', | 1776 '../base/base.gyp:base', |
| 1779 '../base/base.gyp:base_i18n', | 1777 '../base/base.gyp:base_i18n', |
| 1780 '../base/base.gyp:test_support_base', | 1778 '../base/base.gyp:test_support_base', |
| 1781 '../net/net.gyp:net', | 1779 '../net/net.gyp:net', |
| 1782 '../net/net.gyp:net_test_support', | 1780 '../net/net.gyp:net_test_support', |
| 1783 '../skia/skia.gyp:skia', | 1781 '../skia/skia.gyp:skia', |
| 1782 '../sync/sync.gyp:sync', |
| 1784 '../testing/gmock.gyp:gmock', | 1783 '../testing/gmock.gyp:gmock', |
| 1785 '../testing/gtest.gyp:gtest', | 1784 '../testing/gtest.gyp:gtest', |
| 1786 '../third_party/cld/cld.gyp:cld', | 1785 '../third_party/cld/cld.gyp:cld', |
| 1787 '../third_party/icu/icu.gyp:icui18n', | 1786 '../third_party/icu/icu.gyp:icui18n', |
| 1788 '../third_party/icu/icu.gyp:icuuc', | 1787 '../third_party/icu/icu.gyp:icuuc', |
| 1789 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', | 1788 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |
| 1790 '../v8/tools/gyp/v8.gyp:v8', | 1789 '../v8/tools/gyp/v8.gyp:v8', |
| 1791 # Runtime dependencies | 1790 # Runtime dependencies |
| 1792 '../third_party/mesa/mesa.gyp:osmesa', | 1791 '../third_party/mesa/mesa.gyp:osmesa', |
| 1793 ], | 1792 ], |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2063 '../ui/views/views.gyp:views', | 2062 '../ui/views/views.gyp:views', |
| 2064 ], | 2063 ], |
| 2065 }], | 2064 }], |
| 2066 ], | 2065 ], |
| 2067 }, | 2066 }, |
| 2068 { | 2067 { |
| 2069 'target_name': 'sync_integration_tests', | 2068 'target_name': 'sync_integration_tests', |
| 2070 'type': 'executable', | 2069 'type': 'executable', |
| 2071 'dependencies': [ | 2070 'dependencies': [ |
| 2072 'browser', | 2071 'browser', |
| 2073 '../sync/protocol/sync_proto.gyp:sync_proto', | |
| 2074 'chrome', | 2072 'chrome', |
| 2075 'chrome_resources.gyp:chrome_resources', | 2073 'chrome_resources.gyp:chrome_resources', |
| 2076 'chrome_resources.gyp:chrome_strings', | 2074 'chrome_resources.gyp:chrome_strings', |
| 2077 'chrome_resources.gyp:packed_extra_resources', | 2075 'chrome_resources.gyp:packed_extra_resources', |
| 2078 'chrome_resources.gyp:packed_resources', | 2076 'chrome_resources.gyp:packed_resources', |
| 2079 'common', | 2077 'common', |
| 2080 'common/extensions/api/api.gyp:api', | 2078 'common/extensions/api/api.gyp:api', |
| 2081 'renderer', | 2079 'renderer', |
| 2082 'test_support_common', | 2080 'test_support_common', |
| 2083 '../net/net.gyp:net', | 2081 '../net/net.gyp:net', |
| 2084 '../printing/printing.gyp:printing', | 2082 '../printing/printing.gyp:printing', |
| 2085 '../skia/skia.gyp:skia', | 2083 '../skia/skia.gyp:skia', |
| 2086 '../sync/sync.gyp:sync_notifier', | 2084 '../sync/sync.gyp:sync', |
| 2087 '../sync/sync.gyp:test_support_sync_testserver', | 2085 '../sync/sync.gyp:test_support_sync_testserver', |
| 2088 '../testing/gmock.gyp:gmock', | 2086 '../testing/gmock.gyp:gmock', |
| 2089 '../testing/gtest.gyp:gtest', | 2087 '../testing/gtest.gyp:gtest', |
| 2090 '../third_party/icu/icu.gyp:icui18n', | 2088 '../third_party/icu/icu.gyp:icui18n', |
| 2091 '../third_party/icu/icu.gyp:icuuc', | 2089 '../third_party/icu/icu.gyp:icuuc', |
| 2092 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', | 2090 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |
| 2093 '../third_party/npapi/npapi.gyp:npapi', | 2091 '../third_party/npapi/npapi.gyp:npapi', |
| 2094 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', | 2092 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', |
| 2095 ], | 2093 ], |
| 2096 'include_dirs': [ | 2094 'include_dirs': [ |
| 2097 '..', | 2095 '..', |
| 2098 '<(INTERMEDIATE_DIR)', | 2096 '<(INTERMEDIATE_DIR)', |
| 2099 '<(protoc_out_dir)', | 2097 '<(protoc_out_dir)', |
| 2100 ], | 2098 ], |
| 2101 # TODO(phajdan.jr): Only temporary, to make transition easier. | 2099 # TODO(phajdan.jr): Only temporary, to make transition easier. |
| 2102 'defines': [ | 2100 'defines': [ |
| 2103 'HAS_OUT_OF_PROC_TEST_RUNNER', | 2101 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| 2104 ], | 2102 ], |
| 2105 'sources': [ | 2103 'sources': [ |
| 2106 'app/chrome_command_ids.h', | 2104 'app/chrome_command_ids.h', |
| 2107 'app/chrome_dll.rc', | 2105 'app/chrome_dll.rc', |
| 2108 'app/chrome_dll_resource.h', | 2106 'app/chrome_dll_resource.h', |
| 2109 'app/chrome_version.rc.version', | 2107 'app/chrome_version.rc.version', |
| 2110 'browser/sessions/session_backend.cc', | |
| 2111 'browser/sync/glue/session_model_associator.cc', | |
| 2112 'test/base/chrome_test_launcher.cc', | 2108 'test/base/chrome_test_launcher.cc', |
| 2113 'test/data/resource.rc', | 2109 'test/data/resource.rc', |
| 2114 'browser/sync/test/integration/apps_helper.cc', | 2110 'browser/sync/test/integration/apps_helper.cc', |
| 2115 'browser/sync/test/integration/apps_helper.h', | 2111 'browser/sync/test/integration/apps_helper.h', |
| 2116 'browser/sync/test/integration/autofill_helper.cc', | 2112 'browser/sync/test/integration/autofill_helper.cc', |
| 2117 'browser/sync/test/integration/autofill_helper.h', | 2113 'browser/sync/test/integration/autofill_helper.h', |
| 2118 'browser/sync/test/integration/bookmarks_helper.cc', | 2114 'browser/sync/test/integration/bookmarks_helper.cc', |
| 2119 'browser/sync/test/integration/bookmarks_helper.h', | 2115 'browser/sync/test/integration/bookmarks_helper.h', |
| 2120 'browser/sync/test/integration/cross_platform_sync_test.cc', | 2116 'browser/sync/test/integration/cross_platform_sync_test.cc', |
| 2121 'browser/sync/test/integration/dictionary_helper.cc', | 2117 'browser/sync/test/integration/dictionary_helper.cc', |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2239 'dependencies': [ | 2235 'dependencies': [ |
| 2240 '../ui/views/views.gyp:views', | 2236 '../ui/views/views.gyp:views', |
| 2241 ], | 2237 ], |
| 2242 }], | 2238 }], |
| 2243 ], | 2239 ], |
| 2244 }, | 2240 }, |
| 2245 { | 2241 { |
| 2246 'target_name': 'sync_performance_tests', | 2242 'target_name': 'sync_performance_tests', |
| 2247 'type': 'executable', | 2243 'type': 'executable', |
| 2248 'dependencies': [ | 2244 'dependencies': [ |
| 2249 '../sync/protocol/sync_proto.gyp:sync_proto', | |
| 2250 'browser', | 2245 'browser', |
| 2251 'chrome', | 2246 'chrome', |
| 2252 'common/extensions/api/api.gyp:api', | 2247 'common/extensions/api/api.gyp:api', |
| 2253 'test_support_common', | 2248 'test_support_common', |
| 2254 '../skia/skia.gyp:skia', | 2249 '../skia/skia.gyp:skia', |
| 2255 '../sync/sync.gyp:sync_notifier', | 2250 '../sync/sync.gyp:sync', |
| 2256 '../sync/sync.gyp:test_support_sync_testserver', | 2251 '../sync/sync.gyp:test_support_sync_testserver', |
| 2257 '../testing/gmock.gyp:gmock', | 2252 '../testing/gmock.gyp:gmock', |
| 2258 '../testing/gtest.gyp:gtest', | 2253 '../testing/gtest.gyp:gtest', |
| 2259 ], | 2254 ], |
| 2260 'include_dirs': [ | 2255 'include_dirs': [ |
| 2261 '..', | 2256 '..', |
| 2262 '<(INTERMEDIATE_DIR)', | 2257 '<(INTERMEDIATE_DIR)', |
| 2263 '<(protoc_out_dir)', | 2258 '<(protoc_out_dir)', |
| 2264 ], | 2259 ], |
| 2265 'defines': [ | 2260 'defines': [ |
| 2266 'HAS_OUT_OF_PROC_TEST_RUNNER', | 2261 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| 2267 ], | 2262 ], |
| 2268 'sources': [ | 2263 'sources': [ |
| 2269 'app/chrome_command_ids.h', | 2264 'app/chrome_command_ids.h', |
| 2270 'app/chrome_dll.rc', | 2265 'app/chrome_dll.rc', |
| 2271 'app/chrome_dll_resource.h', | 2266 'app/chrome_dll_resource.h', |
| 2272 'app/chrome_version.rc.version', | 2267 'app/chrome_version.rc.version', |
| 2273 'browser/sessions/session_backend.cc', | |
| 2274 'browser/sync/glue/session_model_associator.cc', | |
| 2275 'browser/sync/test/integration/autofill_helper.cc', | 2268 'browser/sync/test/integration/autofill_helper.cc', |
| 2276 'browser/sync/test/integration/autofill_helper.h', | 2269 'browser/sync/test/integration/autofill_helper.h', |
| 2277 'browser/sync/test/integration/bookmarks_helper.cc', | 2270 'browser/sync/test/integration/bookmarks_helper.cc', |
| 2278 'browser/sync/test/integration/bookmarks_helper.h', | 2271 'browser/sync/test/integration/bookmarks_helper.h', |
| 2279 'browser/sync/test/integration/dictionary_helper.cc', | 2272 'browser/sync/test/integration/dictionary_helper.cc', |
| 2280 'browser/sync/test/integration/dictionary_helper.h', | 2273 'browser/sync/test/integration/dictionary_helper.h', |
| 2281 'browser/sync/test/integration/dictionary_load_observer.cc', | 2274 'browser/sync/test/integration/dictionary_load_observer.cc', |
| 2282 'browser/sync/test/integration/dictionary_load_observer.h', | 2275 'browser/sync/test/integration/dictionary_load_observer.h', |
| 2283 'browser/sync/test/integration/extensions_helper.cc', | 2276 'browser/sync/test/integration/extensions_helper.cc', |
| 2284 'browser/sync/test/integration/extensions_helper.h', | 2277 'browser/sync/test/integration/extensions_helper.h', |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2550 ], # OS=="win" | 2543 ], # OS=="win" |
| 2551 ['OS=="linux" or OS=="win"', { | 2544 ['OS=="linux" or OS=="win"', { |
| 2552 'targets': [ | 2545 'targets': [ |
| 2553 { | 2546 { |
| 2554 'target_name': 'generate_profile', | 2547 'target_name': 'generate_profile', |
| 2555 'type': 'executable', | 2548 'type': 'executable', |
| 2556 'dependencies': [ | 2549 'dependencies': [ |
| 2557 'test_support_common', | 2550 'test_support_common', |
| 2558 'browser', | 2551 'browser', |
| 2559 'renderer', | 2552 'renderer', |
| 2560 » 'chrome_resources.gyp:packed_resources', | 2553 'chrome_resources.gyp:packed_resources', |
| 2561 '../base/base.gyp:base', | 2554 '../base/base.gyp:base', |
| 2562 '../net/net.gyp:net_test_support', | 2555 '../net/net.gyp:net_test_support', |
| 2563 '../skia/skia.gyp:skia', | 2556 '../skia/skia.gyp:skia', |
| 2564 '../sync/sync.gyp:sync_api', | 2557 '../sync/sync.gyp:sync', |
| 2565 ], | 2558 ], |
| 2566 'include_dirs': [ | 2559 'include_dirs': [ |
| 2567 '..', | 2560 '..', |
| 2568 ], | 2561 ], |
| 2569 'sources': [ | 2562 'sources': [ |
| 2570 'tools/profiles/generate_profile.cc', | 2563 'tools/profiles/generate_profile.cc', |
| 2571 'tools/profiles/thumbnail-inl.h', | 2564 'tools/profiles/thumbnail-inl.h', |
| 2572 ], | 2565 ], |
| 2573 'conditions': [ | 2566 'conditions': [ |
| 2574 ['OS=="win"', { | 2567 ['OS=="win"', { |
| (...skipping 28 matching lines...) Expand all Loading... |
| 2603 'type': 'loadable_module', | 2596 'type': 'loadable_module', |
| 2604 'product_prefix': '_', | 2597 'product_prefix': '_', |
| 2605 'dependencies': [ | 2598 'dependencies': [ |
| 2606 'chrome', | 2599 'chrome', |
| 2607 'chrome_resources.gyp:chrome_resources', | 2600 'chrome_resources.gyp:chrome_resources', |
| 2608 'chrome_resources.gyp:chrome_strings', | 2601 'chrome_resources.gyp:chrome_strings', |
| 2609 'chrome_resources.gyp:theme_resources', | 2602 'chrome_resources.gyp:theme_resources', |
| 2610 'debugger', | 2603 'debugger', |
| 2611 'test_support_common', | 2604 'test_support_common', |
| 2612 '../skia/skia.gyp:skia', | 2605 '../skia/skia.gyp:skia', |
| 2613 '../sync/sync.gyp:sync_api', | 2606 '../sync/sync.gyp:sync', |
| 2614 '../testing/gtest.gyp:gtest', | 2607 '../testing/gtest.gyp:gtest', |
| 2615 ], | 2608 ], |
| 2616 'export_dependent_settings': [ | 2609 'export_dependent_settings': [ |
| 2617 'test_support_common', | 2610 'test_support_common', |
| 2618 ], | 2611 ], |
| 2619 'include_dirs': [ | 2612 'include_dirs': [ |
| 2620 '..', | 2613 '..', |
| 2621 ], | 2614 ], |
| 2622 'cflags': [ | 2615 'cflags': [ |
| 2623 '-Wno-uninitialized', | 2616 '-Wno-uninitialized', |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3006 'sync_integration_tests.isolate', | 2999 'sync_integration_tests.isolate', |
| 3007 ], | 3000 ], |
| 3008 'sources': [ | 3001 'sources': [ |
| 3009 'sync_integration_tests.isolate', | 3002 'sync_integration_tests.isolate', |
| 3010 ], | 3003 ], |
| 3011 }, | 3004 }, |
| 3012 ], | 3005 ], |
| 3013 }], | 3006 }], |
| 3014 ], # 'conditions' | 3007 ], # 'conditions' |
| 3015 } | 3008 } |
| OLD | NEW |